From 18ae133fcb532020cccb2ac59d3156d6f912c56a Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Tue, 20 Nov 2012 21:13:05 +0900 Subject: [PATCH] --- yaml --- r: 338055 b: refs/heads/master c: 937afb70a09d87afa07831bc5ba951a1b8fb3c9b h: refs/heads/master i: 338053: 3c937b92e4510a2bd41355ee3d6040abe144111f 338051: b3168f166c0cf3fa7c323e5f724a02dccc8905f1 338047: 3fb0f9c36da150754f04b2be5fdac31e249e8057 v: v3 --- [refs] | 2 +- .../staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf1e0c5327c6..8b9fbcc14ceb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6f272c25a6b37d2d62b55962f528d6f9b104188 +refs/heads/master: 937afb70a09d87afa07831bc5ba951a1b8fb3c9b diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c index 40217b7867da..f5949e89e5c2 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c @@ -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)); @@ -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; }