Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46754f8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents ef9e83c1 fe6f212c

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

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

			EEPROM_5000_REG_BAND_4_CHANNELS,

			EEPROM_5000_REG_BAND_5_CHANNELS,

			EEPROM_5000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_5000_REG_BAND_52_HT40_CHANNELS

		},

		.verify_signature  = iwlcore_eeprom_verify_signature,
@@ -323,7 +323,7 @@ static struct iwl_lib_ops iwl6050_lib = { 
			EEPROM_5000_REG_BAND_3_CHANNELS,

			EEPROM_5000_REG_BAND_4_CHANNELS,

			EEPROM_5000_REG_BAND_5_CHANNELS,

			EEPROM_5000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_5000_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
@@ -3331,6 +3331,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-core.c

+0 −1
Original line number Diff line number Diff line
@@ -3358,7 +3358,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
@@ -506,7 +506,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);

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

+1 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ struct iwl_priv { 
	struct work_struct tt_work;

	struct work_struct ct_enter;

	struct work_struct ct_exit;

	struct work_struct start_internal_scan;



	struct tasklet_struct irq_tasklet;