mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 11:36:49 +00:00
289c632425
This updates the mac80211 backport. The removed patches are already integrated in the upstream version. The 131-Revert-mac80211-aes-cmac-switch-to-shash-CMAC-driver.patch patch was manually adapted to the changes in kernel 5.7. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
Disable FILS support, since it pulls in crypto hash support
|
|
|
|
--- a/net/mac80211/fils_aead.h
|
|
+++ b/net/mac80211/fils_aead.h
|
|
@@ -7,7 +7,7 @@
|
|
#ifndef FILS_AEAD_H
|
|
#define FILS_AEAD_H
|
|
|
|
-#if LINUX_VERSION_IS_GEQ(4,3,0)
|
|
+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
|
|
int fils_encrypt_assoc_req(struct sk_buff *skb,
|
|
struct ieee80211_mgd_assoc_data *assoc_data);
|
|
int fils_decrypt_assoc_resp(struct ieee80211_sub_if_data *sdata,
|
|
--- a/net/mac80211/fils_aead.c
|
|
+++ b/net/mac80211/fils_aead.c
|
|
@@ -1,4 +1,4 @@
|
|
-#if LINUX_VERSION_IS_GEQ(4,3,0)
|
|
+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* FILS AEAD for (Re)Association Request/Response frames
|
|
--- a/net/mac80211/main.c
|
|
+++ b/net/mac80211/main.c
|
|
@@ -586,7 +586,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
|
|
NL80211_FEATURE_MAC_ON_CREATE |
|
|
NL80211_FEATURE_USERSPACE_MPM |
|
|
NL80211_FEATURE_FULL_AP_CLIENT_STATE;
|
|
-#if LINUX_VERSION_IS_GEQ(4,3,0)
|
|
+#if 0 /* LINUX_VERSION_IS_GEQ(4,3,0) */
|
|
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);
|
|
#endif
|
|
wiphy_ext_feature_set(wiphy,
|