diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-10-30 15:17:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-10-30 15:17:56 +0000 |
| commit | d2dc5092764d32155c95b8358903d1a88de47231 (patch) | |
| tree | e7407a762a23a909064b6e4bbb06b2a775a25e00 /package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch | |
| parent | 27d27caaf4f255a7d99ddeb87c5bd1f2c44477ce (diff) | |
| download | master-187ad058-d2dc5092764d32155c95b8358903d1a88de47231.tar.gz master-187ad058-d2dc5092764d32155c95b8358903d1a88de47231.tar.bz2 master-187ad058-d2dc5092764d32155c95b8358903d1a88de47231.zip | |
mac80211: update to wireless-testing 2015-10-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch index 07dde5481c..02f46c778d 100644 --- a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch +++ b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch @@ -7,11 +7,11 @@ - select BPAUTO_CRYPTO_CCM - depends on CRYPTO_GCM depends on CRC32 - select BPAUTO_AVERAGE ---help--- + This option enables the hardware independent IEEE 802.11 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile -@@ -15,9 +15,7 @@ mac80211-y := \ +@@ -16,9 +16,7 @@ mac80211-y := \ michael.o \ tkip.o \ aes_ccm.o \ @@ -320,7 +320,7 @@ struct { --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c -@@ -304,7 +304,8 @@ ieee80211_crypto_tkip_decrypt(struct iee +@@ -307,7 +307,8 @@ ieee80211_crypto_tkip_decrypt(struct iee } @@ -330,7 +330,7 @@ { __le16 mask_fc; int a4_included, mgmt; -@@ -334,14 +335,8 @@ static void ccmp_special_blocks(struct s +@@ -337,14 +338,8 @@ static void ccmp_special_blocks(struct s else qos_tid = 0; @@ -347,7 +347,7 @@ /* Nonce: Nonce Flags | A2 | PN * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7) -@@ -349,6 +344,8 @@ static void ccmp_special_blocks(struct s +@@ -352,6 +347,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); @@ -356,7 +356,7 @@ /* AAD (extra authenticate-only data) / masked 802.11 header * FC | A1 | A2 | A3 | SC | [A4] | [QC] */ -@@ -460,7 +457,7 @@ static int ccmp_encrypt_skb(struct ieee8 +@@ -463,7 +460,7 @@ static int ccmp_encrypt_skb(struct ieee8 return 0; pos += IEEE80211_CCMP_HDR_LEN; @@ -365,7 +365,7 @@ ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len, skb_put(skb, mic_len), mic_len); -@@ -531,7 +528,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -534,7 +531,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee u8 aad[2 * AES_BLOCK_SIZE]; u8 b_0[AES_BLOCK_SIZE]; /* hardware didn't decrypt/verify MIC */ |