diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-01-11 12:32:37 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-11 12:33:43 +0100 |
| commit | 75e6934a9e996ee7cfe7a488b7f7cc2baa86717a (patch) | |
| tree | d0e6d4a381b2f7a30a66eb29d7fe43190e96cb66 /net/mac80211/mlme.c | |
| parent | regulatory: fix restore_regulatory_settings (diff) | |
| download | linux-dev-75e6934a9e996ee7cfe7a488b7f7cc2baa86717a.tar.xz linux-dev-75e6934a9e996ee7cfe7a488b7f7cc2baa86717a.zip | |
mac80211: fix HT40 connections
My commit 4bf88530be971bf95a7830ca61b4120980bf4347
("mac80211: convert to channel definition struct")
accidentally broke HT40 connections due to swapped
channel flag checks -- fix that.
Reported-by: Sujith Manoharan <sujith@msujith.org>
Tested-by: Sujith Manoharan <sujith@msujith.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index d90c07b1795f..e930175771ff 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -199,11 +199,11 @@ static u32 ieee80211_config_ht_tx(struct ieee80211_sub_if_data *sdata, case NL80211_CHAN_WIDTH_40: if (sdata->vif.bss_conf.chandef.chan->center_freq > sdata->vif.bss_conf.chandef.center_freq1 && - chan->flags & IEEE80211_CHAN_NO_HT40PLUS) + chan->flags & IEEE80211_CHAN_NO_HT40MINUS) disable_40 = true; if (sdata->vif.bss_conf.chandef.chan->center_freq < sdata->vif.bss_conf.chandef.center_freq1 && - chan->flags & IEEE80211_CHAN_NO_HT40MINUS) + chan->flags & IEEE80211_CHAN_NO_HT40PLUS) disable_40 = true; break; default: |