aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-13 17:58:51 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-13 17:58:51 -0400
commit71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd (patch)
treed32c77e506192ef0ba62a10e92aac410eccaa575 /drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
parent7d45a04cbc2683f9552572850f1c711d9b96dd26 (diff)
parent57fbcce37be7c1d2622b56587c10ade00e96afa3 (diff)
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== To synchronize with Kalle, here's just a big change that affects all drivers - removing the duplicated enum ieee80211_band and replacing it by enum nl80211_band. On top of that, just a small documentation update. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
index 3a279d3403ef..fb96bc00f022 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
@@ -724,9 +724,9 @@ static ssize_t iwl_dbgfs_tof_responder_params_write(struct ieee80211_vif *vif,
724 724
725 ret = kstrtou32(data, 10, &value); 725 ret = kstrtou32(data, 10, &value);
726 if (ret == 0 && value) { 726 if (ret == 0 && value) {
727 enum ieee80211_band band = (cmd->channel_num <= 14) ? 727 enum nl80211_band band = (cmd->channel_num <= 14) ?
728 IEEE80211_BAND_2GHZ : 728 NL80211_BAND_2GHZ :
729 IEEE80211_BAND_5GHZ; 729 NL80211_BAND_5GHZ;
730 struct ieee80211_channel chn = { 730 struct ieee80211_channel chn = {
731 .band = band, 731 .band = band,
732 .center_freq = ieee80211_channel_to_frequency( 732 .center_freq = ieee80211_channel_to_frequency(