cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / intel / iwlwifi / dvm / dev.h

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
index 1a7ead7..8148df6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
@@ -677,7 +677,7 @@ struct iwl_priv {
 
        struct iwl_hw_params hw_params;
 
-       enum ieee80211_band band;
+       enum nl80211_band band;
        u8 valid_contexts;
 
        void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
@@ -722,11 +722,11 @@ struct iwl_priv {
        unsigned long scan_start;
        unsigned long scan_start_tsf;
        void *scan_cmd;
-       enum ieee80211_band scan_band;
+       enum nl80211_band scan_band;
        struct cfg80211_scan_request *scan_request;
        struct ieee80211_vif *scan_vif;
        enum iwl_scan_type scan_type;
-       u8 scan_tx_ant[IEEE80211_NUM_BANDS];
+       u8 scan_tx_ant[NUM_NL80211_BANDS];
        u8 mgmt_tx_ant;
 
        /* max number of station keys */