aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/dev.h')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/dvm/dev.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
index 1a7ead753eee..8148df61a916 100644
--- 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 {
677 677
678 struct iwl_hw_params hw_params; 678 struct iwl_hw_params hw_params;
679 679
680 enum ieee80211_band band; 680 enum nl80211_band band;
681 u8 valid_contexts; 681 u8 valid_contexts;
682 682
683 void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv, 683 void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
@@ -722,11 +722,11 @@ struct iwl_priv {
722 unsigned long scan_start; 722 unsigned long scan_start;
723 unsigned long scan_start_tsf; 723 unsigned long scan_start_tsf;
724 void *scan_cmd; 724 void *scan_cmd;
725 enum ieee80211_band scan_band; 725 enum nl80211_band scan_band;
726 struct cfg80211_scan_request *scan_request; 726 struct cfg80211_scan_request *scan_request;
727 struct ieee80211_vif *scan_vif; 727 struct ieee80211_vif *scan_vif;
728 enum iwl_scan_type scan_type; 728 enum iwl_scan_type scan_type;
729 u8 scan_tx_ant[IEEE80211_NUM_BANDS]; 729 u8 scan_tx_ant[NUM_NL80211_BANDS];
730 u8 mgmt_tx_ant; 730 u8 mgmt_tx_ant;
731 731
732 /* max number of station keys */ 732 /* max number of station keys */