summaryrefslogtreecommitdiffstats
path: root/net/mac80211/key.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-23 00:22:44 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 16:35:59 +0100
commita87121051ce80831a302c67286119013104f7a5a (patch)
tree635ef5a687e1b746294d04eeb7e31d12833bb2a5 /net/mac80211/key.c
parent153a5fc4107902a5e053bf4937a9250a1f8da574 (diff)
downloadop-kernel-dev-a87121051ce80831a302c67286119013104f7a5a.zip
op-kernel-dev-a87121051ce80831a302c67286119013104f7a5a.tar.gz
mac80211: remove IEEE80211_KEY_FLAG_WMM_STA
There's no driver using this flag, so it seems that all drivers support HW crypto with WMM or don't support it at all. Remove the flag and code setting it. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/key.c')
-rw-r--r--net/mac80211/key.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index df81b17..6eb4888 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -440,32 +440,6 @@ int ieee80211_key_link(struct ieee80211_key *key,
key->sdata = sdata;
key->sta = sta;
- if (sta) {
- /*
- * some hardware cannot handle TKIP with QoS, so
- * we indicate whether QoS could be in use.
- */
- if (test_sta_flag(sta, WLAN_STA_WME))
- key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
- } else {
- if (sdata->vif.type == NL80211_IFTYPE_STATION) {
- struct sta_info *ap;
-
- /*
- * We're getting a sta pointer in, so must be under
- * appropriate locking for sta_info_get().
- */
-
- /* same here, the AP could be using QoS */
- ap = sta_info_get(key->sdata, key->sdata->u.mgd.bssid);
- if (ap) {
- if (test_sta_flag(ap, WLAN_STA_WME))
- key->conf.flags |=
- IEEE80211_KEY_FLAG_WMM_STA;
- }
- }
- }
-
mutex_lock(&sdata->local->key_mtx);
if (sta && pairwise)
OpenPOWER on IntegriCloud