Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338055
b: refs/heads/master
c: 937afb7
h: refs/heads/master
i:
  338053: 3c937b9
  338051: b3168f1
  338047: 3fb0f9c
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 2cd98c5 commit 18ae133
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d6f272c25a6b37d2d62b55962f528d6f9b104188
refs/heads/master: 937afb70a09d87afa07831bc5ba951a1b8fb3c9b
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
/*
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
(WLAN_FC_GET_STYPE(fc) & 0x08));
*/
*/
// fixed by David :2006.9.6
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
(WLAN_FC_GET_STYPE(fc) & 0x80));
Expand Down Expand Up @@ -340,9 +340,9 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
}

if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
if (net_ratelimit()) {
if (net_ratelimit())
pr_debug("decrypt failed: STA=%pM\n", hdr->addr2);
}

key->dot11RSNAStatsCCMPDecryptErrors++;
return -5;
}
Expand Down

0 comments on commit 18ae133

Please sign in to comment.