domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: Update to backports-5.10.42

Browse Source 
The removed patches were integrated upstream.

The brcmf_driver_work workqueue was removed in brcmfmac with kernel
5.10.42, the asynchronous call was covered to a synchronous call. There
is no need to wait any more.
This part was removed manually from this patch:
brcm/860-brcmfmac-register-wiphy-s-during-module_init.patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 04a260911c)
This commit is contained in:
Hauke Mehrtens
2021-06-05 18:21:57 +02:00
parent b55d3d6904
commit 00d7a459f3
33 changed files with 63 additions and 1532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch
View File

@@ -379,7 +379,7 @@
#endif /* AES_GCM_H */
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -311,7 +311,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
@@ -312,7 +312,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
}
@@ -389,7 +389,7 @@
{
__le16 mask_fc;
int a4_included, mgmt;
@@ -341,14 +342,8 @@ static void ccmp_special_blocks(struct s
@@ -342,14 +343,8 @@ static void ccmp_special_blocks(struct s
else
qos_tid = 0;
@@ -406,7 +406,7 @@
/* Nonce: Nonce Flags | A2 | PN
* Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
@@ -356,6 +351,8 @@ static void ccmp_special_blocks(struct s
@@ -357,6 +352,8 @@ static void ccmp_special_blocks(struct s
b_0[1] = qos_tid | (mgmt << 4);
memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
@@ -415,7 +415,7 @@
/* AAD (extra authenticate-only data) / masked 802.11 header
* FC | A1 | A2 | A3 | SC | [A4] | [QC] */
@@ -412,7 +409,7 @@ static int ccmp_encrypt_skb(struct ieee8
@@ -413,7 +410,7 @@ static int ccmp_encrypt_skb(struct ieee8
u8 *pos;
u8 pn[6];
u64 pn64;
@@ -424,7 +424,7 @@
u8 b_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
@@ -467,9 +464,11 @@ static int ccmp_encrypt_skb(struct ieee8
@@ -468,9 +465,11 @@ static int ccmp_encrypt_skb(struct ieee8
return 0;
pos += IEEE80211_CCMP_HDR_LEN;
@@ -439,7 +439,7 @@
}
@@ -542,13 +541,13 @@ ieee80211_crypto_ccmp_decrypt(struct iee
@@ -543,13 +542,13 @@ ieee80211_crypto_ccmp_decrypt(struct iee
u8 aad[2 * AES_BLOCK_SIZE];
u8 b_0[AES_BLOCK_SIZE];
/* hardware didn't decrypt/verify MIC */
@@ -455,7 +455,7 @@
return RX_DROP_UNUSABLE;
}
@@ -643,7 +642,7 @@ static int gcmp_encrypt_skb(struct ieee8
@@ -646,7 +645,7 @@ static int gcmp_encrypt_skb(struct ieee8
u8 *pos;
u8 pn[6];
u64 pn64;
@@ -464,7 +464,7 @@
u8 j_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
@@ -700,8 +699,10 @@ static int gcmp_encrypt_skb(struct ieee8
@@ -703,8 +702,10 @@ static int gcmp_encrypt_skb(struct ieee8
pos += IEEE80211_GCMP_HDR_LEN;
gcmp_special_blocks(skb, pn, j_0, aad);
@@ -477,7 +477,7 @@
}
ieee80211_tx_result
@@ -1128,9 +1129,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct
@@ -1133,9 +1134,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct
struct ieee80211_key *key = tx->key;
struct ieee80211_mmie_16 *mmie;
struct ieee80211_hdr *hdr;
@@ -489,7 +489,7 @@
if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
return TX_DROP;
@@ -1176,7 +1177,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct
@@ -1181,7 +1182,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_key *key = rx->key;
struct ieee80211_mmie_16 *mmie;