From 3ec36031dba90908de1b60575b018cdf2d20390b Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Mon, 27 Jun 2011 23:58:45 +0300 Subject: [PATCH] --- yaml --- r: 256105 b: refs/heads/master c: 39df600aa6ac027b53c4ce3089cba57467a960df h: refs/heads/master i: 256103: 4ac76f1a03a3b7f04886b1f57a3926c443514722 v: v3 --- [refs] | 2 +- trunk/include/net/mac80211.h | 2 ++ trunk/net/mac80211/cfg.c | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3185940dae95..23d6d082a142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f01dce9474e9f09290707b523a134a9605845b00 +refs/heads/master: 39df600aa6ac027b53c4ce3089cba57467a960df diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 120f102814b6..c9def42c1286 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -933,6 +933,7 @@ enum set_key_cmd { * @aid: AID we assigned to the station if we're an AP * @supp_rates: Bitmap of supported rates (per band) * @ht_cap: HT capabilities of this STA; restricted to our own TX capabilities + * @wme: indicates whether the STA supports WME. Only valid during AP-mode. * @drv_priv: data area for driver use, will always be aligned to * sizeof(void *), size is determined in hw information. */ @@ -941,6 +942,7 @@ struct ieee80211_sta { u8 addr[ETH_ALEN]; u16 aid; struct ieee80211_sta_ht_cap ht_cap; + bool wme; /* must be last */ u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *)))); diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c index 6e56c6ee7ccd..9fe22cc393c8 100644 --- a/trunk/net/mac80211/cfg.c +++ b/trunk/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)) {