iwlwifi: skip mac80211 conf during a hardware scan and replay it afterwards

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-4965.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 9a975efc9460d849d8a888067272cba26a05c256..241f4448a4ada599f7d4d7b829bad603d5754f64 100644 (file)
--- 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;