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>

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;