diff options
author | Zhu Yi <yi.zhu@intel.com> | 2007-12-20 07:10:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:07:54 +0100 |
commit | a0646470e8a965df59054a5c82e53e5572bf04a0 (patch) | |
tree | fe4b434a1b8f2accdcfd3e1055b903ffb20e5d8b /drivers/net/wireless/iwlwifi/iwl-4965.h | |
parent | iwlwifi: proper monitor support (diff) | |
download | linux-a0646470e8a965df59054a5c82e53e5572bf04a0.tar.xz linux-a0646470e8a965df59054a5c82e53e5572bf04a0.zip |
iwlwifi: skip mac80211 conf during a hardware scan and replay it afterwards
This patch skips mac80211 configuration setting during a hardware scan
and replays it afterwards for the iwlwifi drivers.
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h index 9a975efc9460..241f4448a4ad 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965.h @@ -425,6 +425,7 @@ struct iwl4965_rx_queue { #define STATUS_SCAN_HW 14 #define STATUS_POWER_PMI 15 #define STATUS_FW_ERROR 16 +#define STATUS_CONF_PENDING 17 #define MAX_TID_COUNT 9 @@ -1023,7 +1024,6 @@ struct iwl4965_priv { struct ieee80211_hw *hw; struct ieee80211_channel *ieee_channels; struct ieee80211_rate *ieee_rates; - struct ieee80211_conf *cache_conf; /* temporary frame storage list */ struct list_head free_frames; |