aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index d5855ae387e8..36745f494f63 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -102,7 +102,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
102 sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0; 102 sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
103 103
104 local->oper_channel = chan; 104 local->oper_channel = chan;
105 local->oper_channel_type = NL80211_CHAN_NO_HT; 105 WARN_ON(!ieee80211_set_channel_type(local, sdata, NL80211_CHAN_NO_HT));
106 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); 106 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
107 107
108 sband = local->hw.wiphy->bands[chan->band]; 108 sband = local->hw.wiphy->bands[chan->band];
@@ -910,7 +910,8 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
910 /* fix ourselves to that channel now already */ 910 /* fix ourselves to that channel now already */
911 if (params->channel_fixed) { 911 if (params->channel_fixed) {
912 sdata->local->oper_channel = params->channel; 912 sdata->local->oper_channel = params->channel;
913 sdata->local->oper_channel_type = NL80211_CHAN_NO_HT; 913 WARN_ON(!ieee80211_set_channel_type(sdata->local, sdata,
914 NL80211_CHAN_NO_HT));
914 } 915 }
915 916
916 if (params->ie) { 917 if (params->ie) {