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