diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-05 18:22:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-05 18:22:39 -0700 |
| commit | 994635a137f637466d36a7c6272dae014a46a11c (patch) | |
| tree | 7699d4fd6d1cbb3827d116bfbada1b9f84ed6f6c /net/mac80211/cfg.c | |
| parent | 7d09926d1decb658d4e24f70216b6b0b74168026 (diff) | |
| parent | df2cbe40753dc36af294c30209ed909869aca6cf (diff) | |
| download | linux-994635a137f637466d36a7c6272dae014a46a11c.tar.gz linux-994635a137f637466d36a7c6272dae014a46a11c.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 6e56c6ee7ccd..9fe22cc393c8 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -674,8 +674,11 @@ static void sta_apply_parameters(struct ieee80211_local *local, if (mask & BIT(NL80211_STA_FLAG_WME)) { sta->flags &= ~WLAN_STA_WME; - if (set & BIT(NL80211_STA_FLAG_WME)) + sta->sta.wme = false; + if (set & BIT(NL80211_STA_FLAG_WME)) { sta->flags |= WLAN_STA_WME; + sta->sta.wme = true; + } } if (mask & BIT(NL80211_STA_FLAG_MFP)) { |