diff --git a/[refs] b/[refs] index 3a5c334c7a88..885fbc72f93e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15fae50a9bd28a9fe490b053ff4353f8a38ea5a0 +refs/heads/master: 6741e7f048dacc92e37c5d724ff5c64e45f6c2c9 diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c index 33fd8d9f714e..cef7c29214a8 100644 --- a/trunk/net/mac80211/ibss.c +++ b/trunk/net/mac80211/ibss.c @@ -457,8 +457,8 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, * fall back to HT20 if we don't use or use * the other extension channel */ - if ((channel_type == NL80211_CHAN_HT40MINUS || - channel_type == NL80211_CHAN_HT40PLUS) && + if (!(channel_type == NL80211_CHAN_HT40MINUS || + channel_type == NL80211_CHAN_HT40PLUS) || channel_type != sdata->u.ibss.channel_type) sta_ht_cap_new.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;