mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-18 09:51:26 +00:00
3affbc1cad
This series is based on * 2020-07-10 ipq6018-ilq-11-0_qca_oem-034672b0676c37b1f4519e5720e18e95fe6236ef Add support for * qsdk kernel/v4.4 * qsdk ethernet subsystem * v5.7 ath11k backport + QualComm staging patches (wlan_ap_1.0) * ath11k-firmware * hostapd/iw/... Feature support * full boot, system detection * sysupgrade to nand * HE support via latest hostapd * driver support for usb, crypto, hwmon, cpufreq, ... Missing * NSS/HW flow offloading - FW blob is not redistributable Using the qsdk v4.4 is an intermediate solution while the vanilla is being tested. Vanilla kernel is almost on feature par. Work has already started to upstream the ethernet and switch drivers. Once complete the target will be fully upstream. Signed-off-by: John Crispin <john@phrozen.org>
45 lines
1.6 KiB
Plaintext
45 lines
1.6 KiB
Plaintext
Index: backports-20200415-4.4.60-9de9a9b19d3f/net/mac80211/iface.c
|
|
===================================================================
|
|
--- backports-20200415-4.4.60-9de9a9b19d3f.orig/net/mac80211/iface.c
|
|
+++ backports-20200415-4.4.60-9de9a9b19d3f/net/mac80211/iface.c
|
|
@@ -1294,7 +1294,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) {
|
|
@@ -1323,13 +1322,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;
|
|
Index: backports-20200415-4.4.60-9de9a9b19d3f/net/mac80211/key.c
|
|
===================================================================
|
|
--- backports-20200415-4.4.60-9de9a9b19d3f.orig/net/mac80211/key.c
|
|
+++ backports-20200415-4.4.60-9de9a9b19d3f/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);
|
|
|