diff options
| author | David S. Miller | 2012-05-15 00:00:48 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-05-15 00:00:48 +0200 |
| commit | c597f6653d5734c11b1e3217c7619a37e96e5a1f (patch) | |
| tree | 2c24b46bbe265f3284dcec0a001f7af498794964 /net/mac80211/mlme.c | |
| parent | net: codel: fix build errors (diff) | |
| parent | iwlwifi: fix-up some merge damage from commit 0d6c4a2 (diff) | |
| download | kernel-qcow2-linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.gz kernel-qcow2-linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.xz kernel-qcow2-linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index b1c617fdabd6..52cd301245ae 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -210,7 +210,7 @@ static u32 ieee80211_config_ht_tx(struct ieee80211_sub_if_data *sdata, disable_40 = true; if (sta && (!reconfig || - (disable_40 != !!(sta->sta.ht_cap.cap & + (disable_40 != !(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)))) { if (disable_40) |