Commit 8715fa28 authored by Reinette Chatre's avatar Reinette Chatre
Browse files

Merge branch 'wireless-2.6' into wireless-next-2.6 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
parents a5e944f1 f2fa1b01

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

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static struct iwl_lib_ops iwl6000_lib = { 
			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.verify_signature  = iwlcore_eeprom_verify_signature,
@@ -328,7 +328,7 @@ static struct iwl_lib_ops iwl6050_lib = { 
			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.verify_signature  = iwlcore_eeprom_verify_signature,

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

+1 −0
Original line number Diff line number Diff line
@@ -3304,6 +3304,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) 


	cancel_delayed_work_sync(&priv->init_alive_start);

	cancel_delayed_work(&priv->scan_check);

	cancel_work_sync(&priv->start_internal_scan);

	cancel_delayed_work(&priv->alive_start);

	cancel_work_sync(&priv->beacon_update);

	del_timer_sync(&priv->statistics_periodic);

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

+12 −0
Original line number Diff line number Diff line
@@ -807,6 +807,18 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv, 
		}

	}



	/*

	 * The above algorithm sometimes fails when the ucode

	 * reports 0 for all chains. It's not clear why that

	 * happens to start with, but it is then causing trouble

	 * because this can make us enable more chains than the

	 * hardware really has.

	 *

	 * To be safe, simply mask out any chains that we know

	 * are not on the device.

	 */

	active_chains &= priv->hw_params.valid_rx_ant;



	num_tx_chains = 0;

	for (i = 0; i < NUM_RX_CHAINS; i++) {

		/* loops on all the bits of

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

+0 −1
Original line number Diff line number Diff line
@@ -2801,7 +2801,6 @@ static void iwl_force_rf_reset(struct iwl_priv *priv) 
	 */

	IWL_DEBUG_INFO(priv, "perform radio reset.\n");

	iwl_internal_short_hw_scan(priv);

	return;

}

drivers/net/wireless/iwlwifi/iwl-core.h

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ void iwl_init_scan_params(struct iwl_priv *priv); 
int iwl_scan_cancel(struct iwl_priv *priv);

int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

int iwl_mac_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req);

int iwl_internal_short_hw_scan(struct iwl_priv *priv);

void iwl_internal_short_hw_scan(struct iwl_priv *priv);

int iwl_force_reset(struct iwl_priv *priv, int mode);

u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,

		       const u8 *ie, int ie_len, int left);