diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 19:41:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 19:41:07 +0000 |
| commit | 740c755805810f7179891099bae984436f20ff56 (patch) | |
| tree | a7ecfe2ea1bef247c584adce22f49301b08fd957 /package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch | |
| parent | 82e2aeb59952899bd0dbcf728d2e2788570a2561 (diff) | |
| download | mtk-20170518-740c755805810f7179891099bae984436f20ff56.zip mtk-20170518-740c755805810f7179891099bae984436f20ff56.tar.gz mtk-20170518-740c755805810f7179891099bae984436f20ff56.tar.bz2 | |
mac80211: update to wireless-testing 2014-11-04
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43210
Diffstat (limited to 'package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch b/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch index a84ce20..cb14c0b 100644 --- a/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch +++ b/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch @@ -246,7 +246,7 @@ struct { --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c -@@ -304,15 +304,22 @@ ieee80211_crypto_tkip_decrypt(struct iee +@@ -302,15 +302,22 @@ ieee80211_crypto_tkip_decrypt(struct iee } @@ -271,7 +271,7 @@ /* * Mask FC: zero subtype b4 b5 b6 (if not mgmt) * Retry, PwrMgt, MoreData; set Protected -@@ -334,21 +341,20 @@ static void ccmp_special_blocks(struct s +@@ -332,21 +339,20 @@ static void ccmp_special_blocks(struct s else qos_tid = 0; @@ -300,7 +300,7 @@ /* AAD (extra authenticate-only data) / masked 802.11 header * FC | A1 | A2 | A3 | SC | [A4] | [QC] */ -@@ -404,8 +410,7 @@ static int ccmp_encrypt_skb(struct ieee8 +@@ -402,8 +408,7 @@ static int ccmp_encrypt_skb(struct ieee8 u8 *pos; u8 pn[6]; u64 pn64; @@ -310,7 +310,7 @@ if (info->control.hw_key && !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) && -@@ -461,9 +466,9 @@ static int ccmp_encrypt_skb(struct ieee8 +@@ -457,9 +462,9 @@ static int ccmp_encrypt_skb(struct ieee8 return 0; pos += IEEE80211_CCMP_HDR_LEN; @@ -323,7 +323,7 @@ return 0; } -@@ -526,16 +531,16 @@ ieee80211_crypto_ccmp_decrypt(struct iee +@@ -522,16 +527,16 @@ ieee80211_crypto_ccmp_decrypt(struct iee } if (!(status->flag & RX_FLAG_DECRYPTED)) { |