aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/key.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-22 18:22:44 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 10:35:59 -0500
commita87121051ce80831a302c67286119013104f7a5a (patch)
tree635ef5a687e1b746294d04eeb7e31d12833bb2a5 /net/mac80211/key.c
parent153a5fc4107902a5e053bf4937a9250a1f8da574 (diff)
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 df81b178c594..6eb4888a70ed 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -440,32 +440,6 @@ int ieee80211_key_link(struct ieee80211_key *key,
440 key->sdata = sdata; 440 key->sdata = sdata;
441 key->sta = sta; 441 key->sta = sta;
442 442
443 if (sta) {
444 /*
445 * some hardware cannot handle TKIP with QoS, so
446 * we indicate whether QoS could be in use.
447 */
448 if (test_sta_flag(sta, WLAN_STA_WME))
449 key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
450 } else {
451 if (sdata->vif.type == NL80211_IFTYPE_STATION) {
452 struct sta_info *ap;
453
454 /*
455 * We're getting a sta pointer in, so must be under
456 * appropriate locking for sta_info_get().
457 */
458
459 /* same here, the AP could be using QoS */
460 ap = sta_info_get(key->sdata, key->sdata->u.mgd.bssid);
461 if (ap) {
462 if (test_sta_flag(ap, WLAN_STA_WME))
463 key->conf.flags |=
464 IEEE80211_KEY_FLAG_WMM_STA;
465 }
466 }
467 }
468
469 mutex_lock(&sdata->local->key_mtx); 443 mutex_lock(&sdata->local->key_mtx);
470 444
471 if (sta && pairwise) 445 if (sta && pairwise)