mac80211, ath9k: update to latest trunk as of r27572

[openwrt-10.03/.git] / package / mac80211 / patches / 420-mac80211_ignore_invalid_ccmp_rx_pn.patch

diff --git a/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch b/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch
index f6793541f2aaa60480939a492468ca4f1ecc3858..0222f54b6b865b4cc2f1705e1a943ed05deaab0c 100644 (file)
--- a/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch
+++ b/package/mac80211/patches/420-mac80211_ignore_invalid_ccmp_rx_pn.patch
@@ -1,16 +1,16 @@
 --- a/net/mac80211/key.h
 +++ b/net/mac80211/key.h
-@@ -86,6 +86,7 @@ struct ieee80211_key {
+@@ -90,6 +90,7 @@ struct ieee80211_key {
                         * Management frames.
                         */
                        u8 rx_pn[NUM_RX_DATA_QUEUES + 1][6];
 +                      u8 rx_invalid_pn[NUM_RX_DATA_QUEUES + 1];
                        struct crypto_cipher *tfm;
                        u32 replays; /* dot11RSNAStatsCCMPReplays */
-                       /* scratch buffers for virt_to_page() (crypto API) */
+ #ifndef AES_BLOCK_LEN
 --- a/net/mac80211/wpa.c
 +++ b/net/mac80211/wpa.c
-@@ -441,6 +441,13 @@ ieee80211_crypto_ccmp_encrypt(struct iee
+@@ -457,6 +457,13 @@ ieee80211_crypto_ccmp_encrypt(struct iee
        return TX_CONTINUE;
  }
  
@@ -24,7 +24,7 @@
  
  ieee80211_rx_result
  ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
-@@ -453,6 +460,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -469,6 +476,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
        u8 pn[CCMP_PN_LEN];
        int data_len;
        int queue;
@@ -32,7 +32,7 @@
  
        hdrlen = ieee80211_hdrlen(hdr->frame_control);
  
-@@ -486,6 +494,11 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -503,6 +511,11 @@ ieee80211_crypto_ccmp_decrypt(struct iee
                        return RX_DROP_UNUSABLE;
        }