diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 14:29:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 14:29:22 -0700 |
| commit | f10023a4ef3f5cc05457b059c6880bc447adfa1f (patch) | |
| tree | e5d229bb9719b0be27289a6736d2e22254da06f0 /net/wireless/lib80211_crypt_ccmp.c | |
| parent | 4ada8107f465b97326751de66d3c11ed78bf8214 (diff) | |
| parent | 640c65eae673d2caf6e7bf61c1eb4e9513b88fda (diff) | |
| download | op-kernel-dev-f10023a4ef3f5cc05457b059c6880bc447adfa1f.zip op-kernel-dev-f10023a4ef3f5cc05457b059c6880bc447adfa1f.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/lib80211_crypt_ccmp.c')
| -rw-r--r-- | net/wireless/lib80211_crypt_ccmp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/lib80211_crypt_ccmp.c b/net/wireless/lib80211_crypt_ccmp.c index db42819..2301dc1 100644 --- a/net/wireless/lib80211_crypt_ccmp.c +++ b/net/wireless/lib80211_crypt_ccmp.c @@ -337,6 +337,7 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) pos += 8; if (ccmp_replay_check(pn, key->rx_pn)) { +#ifdef CONFIG_LIB80211_DEBUG if (net_ratelimit()) { printk(KERN_DEBUG "CCMP: replay detected: STA=%pM " "previous PN %02x%02x%02x%02x%02x%02x " @@ -346,6 +347,7 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) key->rx_pn[3], key->rx_pn[4], key->rx_pn[5], pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]); } +#endif key->dot11RSNAStatsCCMPReplays++; return -4; } |
