2013-02-28 22:18:41

by Johannes Berg

Subject: [PATCH] mac80211: remove IEEE80211_KEY_FLAG_WMM_STA

From: Johannes Berg <[email protected]>

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 <[email protected]>
---
include/net/mac80211.h | 3 ---
net/mac80211/key.c | 26 --------------------------
2 files changed, 29 deletions(-)

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 1568cc6..ac0272f 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1103,8 +1103,6 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
* These flags are used for communication about keys between the driver
* and mac80211, with the @flags parameter of &struct ieee80211_key_conf.
*
- * @IEEE80211_KEY_FLAG_WMM_STA: Set by mac80211, this flag indicates
- * that the STA this key will be used with could be using QoS.
* @IEEE80211_KEY_FLAG_GENERATE_IV: This flag should be set by the
* driver to indicate that it requires IV generation for this
* particular key.
@@ -1129,7 +1127,6 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
* %IEEE80211_KEY_FLAG_SW_MGMT_TX flag to encrypt such frames in SW.
*/
enum ieee80211_key_flags {
- IEEE80211_KEY_FLAG_WMM_STA = 1<<0,
IEEE80211_KEY_FLAG_GENERATE_IV = 1<<1,
IEEE80211_KEY_FLAG_GENERATE_MMIC= 1<<2,
IEEE80211_KEY_FLAG_PAIRWISE = 1<<3,
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index ef252eb..c4bc3bd 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)
--
1.8.0

2013-03-04 15:33:21

by Johannes Berg

Subject: Re: [PATCH] mac80211: remove IEEE80211_KEY_FLAG_WMM_STA

On Thu, 2013-02-28 at 23:18 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> 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.

Applied.

johannes