diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-01 23:28:36 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-19 12:35:55 +0200 |
commit | e6cadb215cba051464eaeba8040d8c82d524b088 (patch) | |
tree | af1d20d6c2168dda699b1a4de622acb848fe21fc /package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch | |
parent | 67dc023f87699e56457a3ba4a97da60605042bd7 (diff) | |
download | upstream-e6cadb215cba051464eaeba8040d8c82d524b088.tar.gz upstream-e6cadb215cba051464eaeba8040d8c82d524b088.tar.bz2 upstream-e6cadb215cba051464eaeba8040d8c82d524b088.zip |
mac80211: Update to version 5.4-rc2
This updates mac80211 to backports based on kernel 5.4-rc2
ath10k-ct was updated to match the API changes and iw now uses the new
nl80211.h header file.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch index f5ec895f0b..5fe7616143 100644 --- a/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch +++ b/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch @@ -476,7 +476,7 @@ } ieee80211_tx_result -@@ -1124,9 +1125,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct +@@ -1128,9 +1129,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct struct ieee80211_key *key = tx->key; struct ieee80211_mmie_16 *mmie; struct ieee80211_hdr *hdr; @@ -488,7 +488,7 @@ if (WARN_ON(skb_queue_len(&tx->skbs) != 1)) return TX_DROP; -@@ -1172,7 +1173,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct +@@ -1176,7 +1177,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; @@ -687,7 +687,7 @@ #endif /* AES_GMAC_H */ --- a/net/mac80211/key.h +++ b/net/mac80211/key.h -@@ -87,7 +87,7 @@ struct ieee80211_key { +@@ -88,7 +88,7 @@ struct ieee80211_key { * Management frames. */ u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN]; |