All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Wey-Yi Guy" <wey-yi.w.guy@intel.com>,
	Johannes Berg <johannes.berg@intel.com>
Subject: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Tue, 14 Dec 2010 13:22:35 +1100	[thread overview]
Message-ID: <20101214132235.4b29a2a2.sfr@canb.auug.org.au> (raw)

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h between commit
6942fec92d3d1b6918425730de31b4c6d0d5c196 ("iwlagn: implement
layout-agnostic EEPROM reading") from the wireless-current tree and
commit 564b344c10b694d433cef5b89f8ff8ac5e33898d ("iwlwifi: change default
led mode for different devices") from the wireless tree.

I fixed it up (hopefully, see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-1000.c
index 0e027f7,3c983e4..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@@ -315,7 -310,7 +310,8 @@@ struct iwl_cfg iwl100_bgn_cfg = 
  	.mod_params = &iwlagn_mod_params,
  	.base_params = &iwl1000_base_params,
  	.ht_params = &iwl1000_ht_params,
 +	.use_new_eeprom_reading = true,
+ 	.led_mode = IWL_LED_RF_STATE,
  };
  
  struct iwl_cfg iwl100_bg_cfg = {
@@@ -331,7 -323,7 +324,8 @@@
  	.ops = &iwl1000_ops,
  	.mod_params = &iwlagn_mod_params,
  	.base_params = &iwl1000_base_params,
 +	.use_new_eeprom_reading = true,
+ 	.led_mode = IWL_LED_RF_STATE,
  };
  
  MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
index 0ceeaac,808942c..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@@ -561,11 -563,11 +563,12 @@@ struct iwl_cfg iwl6005_2agn_cfg = 
  	.ht_params = &iwl6000_ht_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
 +	.use_new_eeprom_reading = true,
+ 	.led_mode = IWL_LED_RF_STATE,
  };
  
- struct iwl_cfg iwl6000g2a_2abg_cfg = {
- 	.name = "6000 Series 2x2 ABG Gen2a",
+ struct iwl_cfg iwl6005_2abg_cfg = {
+ 	.name = "Intel(R) Centrino(R) Advanced-N 6205 ABG",
  	.fw_name_pre = IWL6000G2A_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -579,11 -578,11 +579,12 @@@
  	.base_params = &iwl6000_base_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
 +	.use_new_eeprom_reading = true,
+ 	.led_mode = IWL_LED_RF_STATE,
  };
  
- struct iwl_cfg iwl6000g2a_2bg_cfg = {
- 	.name = "6000 Series 2x2 BG Gen2a",
+ struct iwl_cfg iwl6005_2bg_cfg = {
+ 	.name = "Intel(R) Centrino(R) Advanced-N 6205 BG",
  	.fw_name_pre = IWL6000G2A_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -597,11 -593,11 +595,12 @@@
  	.base_params = &iwl6000_base_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
 +	.use_new_eeprom_reading = true,
+ 	.led_mode = IWL_LED_RF_STATE,
  };
  
- struct iwl_cfg iwl6000g2b_2agn_cfg = {
- 	.name = "6000 Series 2x2 AGN Gen2b",
+ struct iwl_cfg iwl6030_2agn_cfg = {
+ 	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
  	.fw_name_pre = IWL6000G2B_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -617,13 -610,14 +613,15 @@@
  	.ht_params = &iwl6000_ht_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
- struct iwl_cfg iwl6000g2b_2abg_cfg = {
- 	.name = "6000 Series 2x2 ABG Gen2b",
+ struct iwl_cfg iwl6030_2abg_cfg = {
+ 	.name = "Intel(R) Centrino(R) Advanced-N 6230 ABG",
  	.fw_name_pre = IWL6000G2B_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -638,13 -629,14 +633,15 @@@
  	.bt_params = &iwl6000_bt_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
- struct iwl_cfg iwl6000g2b_2bgn_cfg = {
- 	.name = "6000 Series 2x2 BGN Gen2b",
+ struct iwl_cfg iwl6030_2bgn_cfg = {
+ 	.name = "Intel(R) Centrino(R) Advanced-N 6230 BGN",
  	.fw_name_pre = IWL6000G2B_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -660,13 -649,14 +654,15 @@@
  	.ht_params = &iwl6000_ht_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
- struct iwl_cfg iwl6000g2b_2bg_cfg = {
- 	.name = "6000 Series 2x2 BG Gen2b",
+ struct iwl_cfg iwl6030_2bg_cfg = {
+ 	.name = "Intel(R) Centrino(R) Advanced-N 6230 BG",
  	.fw_name_pre = IWL6000G2B_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -681,13 -668,14 +674,15 @@@
  	.bt_params = &iwl6000_bt_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
- struct iwl_cfg iwl6000g2b_bgn_cfg = {
- 	.name = "6000 Series 1x2 BGN Gen2b",
+ struct iwl_cfg iwl1030_bgn_cfg = {
+ 	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
  	.fw_name_pre = IWL6000G2B_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -703,13 -688,14 +695,15 @@@
  	.ht_params = &iwl6000_ht_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
- struct iwl_cfg iwl6000g2b_bg_cfg = {
- 	.name = "6000 Series 1x2 BG Gen2b",
+ struct iwl_cfg iwl1030_bg_cfg = {
+ 	.name = "Intel(R) Centrino(R) Wireless-N 1030 BG",
  	.fw_name_pre = IWL6000G2B_FW_PRE,
  	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
  	.ucode_api_min = IWL6000G2_UCODE_API_MIN,
@@@ -724,9 -707,10 +715,11 @@@
  	.bt_params = &iwl6000_bt_params,
  	.need_dc_calib = true,
  	.need_temp_offset_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
  /*
@@@ -813,7 -792,7 +801,8 @@@ struct iwl_cfg iwl6150_bgn_cfg = 
  	.base_params = &iwl6050_base_params,
  	.ht_params = &iwl6000_ht_params,
  	.need_dc_calib = true,
 +	.use_new_eeprom_reading = true,
+ 	.led_mode = IWL_LED_RF_STATE,
  };
  
  struct iwl_cfg iwl6050_2abg_cfg = {
@@@ -865,9 -837,10 +847,11 @@@ struct iwl_cfg iwl130_bgn_cfg = 
  	.bt_params = &iwl6000_bt_params,
  	.ht_params = &iwl6000_ht_params,
  	.need_dc_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
  struct iwl_cfg iwl130_bg_cfg = {
@@@ -885,9 -855,10 +866,11 @@@
  	.base_params = &iwl6000_coex_base_params,
  	.bt_params = &iwl6000_bt_params,
  	.need_dc_calib = true,
+ 	.led_mode = IWL_LED_RF_STATE,
+ 	.adv_pm = true,
  	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
  	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 +	.use_new_eeprom_reading = true,
  };
  
  MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 954ecc2,568920a..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -390,7 -410,8 +410,9 @@@ struct iwl_cfg 
  	const bool need_temp_offset_calib; /* if used set to true */
  	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
  	u8 scan_tx_antennas[IEEE80211_NUM_BANDS];
 +	const bool use_new_eeprom_reading; /* temporary, remove later */
+ 	enum iwl_led_mode led_mode;
+ 	const bool adv_pm;
  };
  
  /***************************

             reply	other threads:[~2010-12-14  2:22 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-14  2:22 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-09-28  3:19 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2011-09-28  9:10 ` Jouni Malinen
2011-09-28  9:10   ` Jouni Malinen
2011-09-14  3:05 Stephen Rothwell
2011-06-21  1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05  2:21 Stephen Rothwell
2011-04-05  2:21 Stephen Rothwell
2010-08-30  1:58 Stephen Rothwell
2010-04-09  1:05 Stephen Rothwell
2010-04-07  2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31   ` Stephen Rothwell
2010-04-07 23:19   ` David Miller
2010-04-01  1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
2010-03-11  2:15 Stephen Rothwell
2010-03-11  2:38 ` Bruno Randolf
2010-03-11  3:04   ` Stephen Rothwell
2010-02-23  1:26 Stephen Rothwell
2009-11-24  3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09  1:40 Stephen Rothwell
2009-04-22  1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38   ` John W. Linville
2009-02-19  5:27 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101214132235.4b29a2a2.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=wey-yi.w.guy@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.