Merge tag 'nfc-next-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...

[mirror_ubuntu-hirsute-kernel.git] / drivers / net / wireless / intel / iwlwifi / dvm / rs.h

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
index c5fe4458461372ea2cdfe30b289e1715f370a445..50c1e951dd2de1b2088077fb77cb54c65c44a8bf 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
@@ -355,7 +355,7 @@ struct iwl_lq_sta {
        u8 action_counter;      /* # mode-switch actions tried */
        u8 is_green;
        u8 is_dup;
-       enum ieee80211_band band;
+       enum nl80211_band band;
 
        /* The following are bitmaps of rates; IWL_RATE_6M_MASK, etc. */
        u32 supp_rates;