projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: backport latest version from trunk as of r27395
[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 4d0f861344447d567d653b79d59eebb6bb6ab1cd..f6793541f2aaa60480939a492468ca4f1ecc3858 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
@@
-10,7
+10,7
@@
/* scratch buffers for virt_to_page() (crypto API) */
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
/* scratch buffers for virt_to_page() (crypto API) */
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
-@@ -4
07,6 +407
,13 @@ ieee80211_crypto_ccmp_encrypt(struct iee
+@@ -4
41,6 +441
,13 @@ ieee80211_crypto_ccmp_encrypt(struct iee
return TX_CONTINUE;
}
return TX_CONTINUE;
}
@@
-24,7
+24,7
@@
ieee80211_rx_result
ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
ieee80211_rx_result
ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
-@@ -4
19,6 +426
,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -4
53,6 +460
,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
u8 pn[CCMP_PN_LEN];
int data_len;
int queue;
u8 pn[CCMP_PN_LEN];
int data_len;
int queue;
@@
-32,7
+32,7
@@
hdrlen = ieee80211_hdrlen(hdr->frame_control);
hdrlen = ieee80211_hdrlen(hdr->frame_control);
-@@ -4
52,6 +460
,11 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -4
86,6 +494
,11 @@ ieee80211_crypto_ccmp_decrypt(struct iee
return RX_DROP_UNUSABLE;
}
return RX_DROP_UNUSABLE;
}