From 627347a08b04bb1de3a22f4af7db03bfd09756cd Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Sat, 2 May 2009 00:37:19 -0400 Subject: [PATCH] --- yaml --- r: 150372 b: refs/heads/master c: 768777ea1118f6ff3f1a013557e7bc4f5d2683a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6fd8ed808a06..d1af9b4df5a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 689da1b3b8b37ff41e79f3fb973c06cdfeef12e5 +refs/heads/master: 768777ea1118f6ff3f1a013557e7bc4f5d2683a4 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index da582b643b9a..a1944b8722e9 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -121,10 +121,14 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, (hti->ht_param & IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)) { switch(hti->ht_param & IEEE80211_HT_PARAM_CHA_SEC_OFFSET) { case IEEE80211_HT_PARAM_CHA_SEC_ABOVE: - channel_type = NL80211_CHAN_HT40PLUS; + if (!(local->hw.conf.channel->flags & + IEEE80211_CHAN_NO_HT40PLUS)) + channel_type = NL80211_CHAN_HT40PLUS; break; case IEEE80211_HT_PARAM_CHA_SEC_BELOW: - channel_type = NL80211_CHAN_HT40MINUS; + if (!(local->hw.conf.channel->flags & + IEEE80211_CHAN_NO_HT40MINUS)) + channel_type = NL80211_CHAN_HT40MINUS; break; } }