Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit aeb998c124786e8c7fbd6eab347230469e911872

Authored by Larry Finger
Committed by Jeff Garzik
1 parent 5d082fe85b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] ieee80211-crypt: Make some TKIP and CCMP error logging conditional 

There are messages arising from ieee80211_crypt that spam the logs
of casual users. These are changed to be logged only if the user
specifically requests the IEEE80211_DEBUG_DROP messages. In either
case, the error/drop count is incremented.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

net/ieee80211/ieee80211_crypt_ccmp.c
Diff comments   View file @ aeb998c
... ... @@ -338,7 +338,7 @@
338 338  
339 339 if (ccmp_replay_check(pn, key->rx_pn)) {
340 340 if (net_ratelimit()) {
341   - printk(KERN_DEBUG "CCMP: replay detected: STA=" MAC_FMT
  341 + IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=" MAC_FMT
342 342 " previous PN %02x%02x%02x%02x%02x%02x "
343 343 "received PN %02x%02x%02x%02x%02x%02x\n",
344 344 MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn),
net/ieee80211/ieee80211_crypt_tkip.c
Diff comments   View file @ aeb998c
... ... @@ -465,7 +465,7 @@
465 465  
466 466 if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
467 467 if (net_ratelimit()) {
468   - printk(KERN_DEBUG "TKIP: replay detected: STA=" MAC_FMT
  468 + IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=" MAC_FMT
469 469 " previous TSC %08x%04x received TSC "
470 470 "%08x%04x\n", MAC_ARG(hdr->addr2),
471 471 tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
... ... @@ -507,7 +507,7 @@
507 507 tkey->rx_phase1_done = 0;
508 508 }
509 509 if (net_ratelimit()) {
510   - printk(KERN_DEBUG "TKIP: ICV error detected: STA="
  510 + IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
511 511 MAC_FMT "\n", MAC_ARG(hdr->addr2));
512 512 }
513 513 tkey->dot11RSNAStatsTKIPICVErrors++;