Commit 840fd8ff authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents b84a7d3d 9e2e7422

drivers/net/wireless/iwlwifi/iwl-1000.c

+4 −4
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.fw_name_pre = IWL1000_FW_PRE,

	.ucode_api_max = IWL1000_UCODE_API_MAX,

	.ucode_api_min = IWL1000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -287,6 +286,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl1000_bg_cfg = {
@@ -294,7 +294,6 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.fw_name_pre = IWL1000_FW_PRE,

	.ucode_api_max = IWL1000_UCODE_API_MAX,

	.ucode_api_min = IWL1000_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -302,6 +301,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl100_bgn_cfg = {
@@ -309,7 +309,6 @@ struct iwl_cfg iwl100_bgn_cfg = { 
	.fw_name_pre = IWL100_FW_PRE,

	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -318,6 +317,7 @@ struct iwl_cfg iwl100_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl100_bg_cfg = {
@@ -325,7 +325,6 @@ struct iwl_cfg iwl100_bg_cfg = { 
	.fw_name_pre = IWL100_FW_PRE,

	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -333,6 +332,7 @@ struct iwl_cfg iwl100_bg_cfg = { 
	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.led_mode = IWL_LED_RF_STATE,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-3945.c

+3 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv, 
	if (iwl_queue_space(q) > q->low_mark && (txq_id >= 0) &&

			(txq_id != IWL39_CMD_QUEUE_NUM) &&

			priv->mac80211_registered)

		iwl_wake_queue(priv, txq_id);

		iwl_wake_queue(priv, txq);

}



/**
@@ -2788,6 +2788,7 @@ static struct iwl_cfg iwl3945_bg_cfg = { 
	.ops = &iwl3945_ops,

	.mod_params = &iwl3945_mod_params,

	.base_params = &iwl3945_base_params,

	.led_mode = IWL_LED_BLINK,

};



static struct iwl_cfg iwl3945_abg_cfg = {
@@ -2800,6 +2801,7 @@ static struct iwl_cfg iwl3945_abg_cfg = { 
	.ops = &iwl3945_ops,

	.mod_params = &iwl3945_mod_params,

	.base_params = &iwl3945_base_params,

	.led_mode = IWL_LED_BLINK,

};



DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {

drivers/net/wireless/iwlwifi/iwl-4965.c

+5 −8
Original line number Diff line number Diff line
@@ -2238,12 +2238,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 


			if (priv->mac80211_registered &&

			    (iwl_queue_space(&txq->q) > txq->q.low_mark) &&

			    (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {

				if (agg->state == IWL_AGG_OFF)

					iwl_wake_queue(priv, txq_id);

				else

					iwl_wake_queue(priv, txq->swq_id);

			}

			    (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))

				iwl_wake_queue(priv, txq);

		}

	} else {

		info->status.rates[0].count = tx_resp->failure_frame + 1;
@@ -2267,7 +2263,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, 


		if (priv->mac80211_registered &&

		    (iwl_queue_space(&txq->q) > txq->q.low_mark))

			iwl_wake_queue(priv, txq_id);

			iwl_wake_queue(priv, txq);

	}

	if (qc && likely(sta_id != IWL_INVALID_STATION))

		iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
@@ -2620,6 +2616,7 @@ static struct iwl_base_params iwl4965_base_params = { 
	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.no_agg_framecnt_info = true,

};



struct iwl_cfg iwl4965_agn_cfg = {
@@ -2627,7 +2624,6 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.fw_name_pre = IWL4965_FW_PRE,

	.ucode_api_max = IWL4965_UCODE_API_MAX,

	.ucode_api_min = IWL4965_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_4965_EEPROM_VERSION,
@@ -2635,6 +2631,7 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.ops = &iwl4965_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl4965_base_params,

	.led_mode = IWL_LED_BLINK,

	/*

	 * Force use of chains B and C for scan RX on 5 GHz band

	 * because the device has off-channel reception on chain A.

drivers/net/wireless/iwlwifi/iwl-5000.c

+7 −7
Original line number Diff line number Diff line
@@ -527,7 +527,6 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -536,6 +535,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5100_bgn_cfg = {
@@ -543,7 +543,6 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -552,6 +551,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5100_abg_cfg = {
@@ -559,7 +559,6 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -567,6 +566,7 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5100_agn_cfg = {
@@ -574,7 +574,6 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -583,6 +582,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5350_agn_cfg = {
@@ -590,7 +590,6 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@ -599,6 +598,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5150_agn_cfg = {
@@ -606,7 +606,6 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.fw_name_pre = IWL5150_FW_PRE,

	.ucode_api_max = IWL5150_UCODE_API_MAX,

	.ucode_api_min = IWL5150_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@ -616,6 +615,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5150_abg_cfg = {
@@ -623,7 +623,6 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.fw_name_pre = IWL5150_FW_PRE,

	.ucode_api_max = IWL5150_UCODE_API_MAX,

	.ucode_api_min = IWL5150_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@ -632,6 +631,7 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-6000.c

+19 −18
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ static struct iwl_bt_params iwl6000_bt_params = { 
	.bt_statistics = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.advanced_bt_coexist = true,

	.agg_time_limit = BT_AGG_THRESHOLD_DEF,

	.bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE,

	.bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT,

};
@@ -555,7 +556,6 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { 
	.fw_name_pre = IWL6000G2A_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -566,6 +566,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6000g2a_2abg_cfg = {
@@ -573,7 +574,6 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = { 
	.fw_name_pre = IWL6000G2A_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -583,6 +583,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = { 
	.base_params = &iwl6000_base_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6000g2a_2bg_cfg = {
@@ -590,7 +591,6 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = { 
	.fw_name_pre = IWL6000G2A_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -600,6 +600,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = { 
	.base_params = &iwl6000_base_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6000g2b_2agn_cfg = {
@@ -607,7 +608,6 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -619,6 +619,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -628,7 +629,6 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -639,6 +639,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -648,7 +649,6 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -660,6 +660,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -669,7 +670,6 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -680,6 +680,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -689,7 +690,6 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -701,6 +701,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -710,7 +711,6 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -721,6 +721,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -733,7 +734,6 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -743,6 +743,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.base_params = &iwl6000_base_params,

	.ht_params = &iwl6000_ht_params,

	.pa_type = IWL_PA_INTERNAL,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6000i_2abg_cfg = {
@@ -750,7 +751,6 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -759,6 +759,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.pa_type = IWL_PA_INTERNAL,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6000i_2bg_cfg = {
@@ -766,7 +767,6 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -775,6 +775,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.pa_type = IWL_PA_INTERNAL,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6050_2agn_cfg = {
@@ -782,7 +783,6 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.ops = &iwl6050_ops,
@@ -792,6 +792,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6050g2_bgn_cfg = {
@@ -799,7 +800,6 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,
@@ -809,6 +809,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6050_2abg_cfg = {
@@ -816,7 +817,6 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,
@@ -825,6 +825,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6050_base_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6000_3agn_cfg = {
@@ -832,7 +833,6 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -842,6 +842,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.base_params = &iwl6000_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl130_bgn_cfg = {
@@ -849,7 +850,6 @@ struct iwl_cfg iwl130_bgn_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -860,6 +860,7 @@ 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,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -869,7 +870,6 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -879,6 +879,7 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};