mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-18 09:51:26 +00:00
41 lines
1.2 KiB
Plaintext
41 lines
1.2 KiB
Plaintext
--- a/net/mac80211/iface.c
|
|
+++ b/net/mac80211/iface.c
|
|
@@ -1306,7 +1306,6 @@ bool ieee80211_set_hw_80211_encap(struct
|
|
struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
|
|
struct ieee80211_local *local = sdata->local;
|
|
struct ieee80211_sub_if_data *iter;
|
|
- struct ieee80211_key *key;
|
|
|
|
mutex_lock(&local->iflist_mtx);
|
|
list_for_each_entry(iter, &local->interfaces, list) {
|
|
@@ -1335,13 +1334,6 @@ bool ieee80211_set_hw_80211_encap(struct
|
|
(local->hw.wiphy->frag_threshold != (u32)-1))
|
|
enable = false;
|
|
|
|
- mutex_lock(&sdata->local->key_mtx);
|
|
- list_for_each_entry(key, &sdata->key_list, list) {
|
|
- if (key->conf.cipher == WLAN_CIPHER_SUITE_TKIP)
|
|
- enable = false;
|
|
- }
|
|
- mutex_unlock(&sdata->local->key_mtx);
|
|
-
|
|
__ieee80211_set_hw_80211_encap(sdata, enable);
|
|
|
|
return enable;
|
|
--- a/net/mac80211/key.c
|
|
+++ b/net/mac80211/key.c
|
|
@@ -178,13 +178,6 @@ static int ieee80211_key_enable_hw_accel
|
|
}
|
|
}
|
|
|
|
- /* TKIP countermeasures don't work in encap offload mode */
|
|
- if (key->conf.cipher == WLAN_CIPHER_SUITE_TKIP &&
|
|
- sdata->hw_80211_encap) {
|
|
- sdata_dbg(sdata, "TKIP is not allowed in hw 80211 encap mode\n");
|
|
- return -EINVAL;
|
|
- }
|
|
-
|
|
ret = drv_set_key(key->local, SET_KEY, sdata,
|
|
sta ? &sta->sta : NULL, &key->conf);
|
|
|