summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-14 18:00:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-14 18:00:48 -0400
commitc597f6653d5734c11b1e3217c7619a37e96e5a1f (patch)
tree2c24b46bbe265f3284dcec0a001f7af498794964 /net/mac80211/mlme.c
parent669d67bf777def468970f2dcba1537edf3b2d329 (diff)
parent341352d13dae752610342923c53ebe461624ee2c (diff)
downloadop-kernel-dev-c597f6653d5734c11b1e3217c7619a37e96e5a1f.zip
op-kernel-dev-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b1c617f..52cd301 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)
OpenPOWER on IntegriCloud