@@ -388,20 +388,20 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
388
388
keyidx = pos [3 ];
389
389
if (!(keyidx & BIT (5 ))) {
390
390
if (net_ratelimit ()) {
391
- printk ( KERN_DEBUG "TKIP: received packet without ExtIV"
391
+ netdev_dbg ( skb -> dev , "TKIP: received packet without ExtIV"
392
392
" flag from %pM\n" , hdr -> addr2 );
393
393
}
394
394
return -2 ;
395
395
}
396
396
keyidx >>= 6 ;
397
397
if (tkey -> key_idx != keyidx ) {
398
- printk ( KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame "
398
+ netdev_dbg ( skb -> dev , "TKIP: RX tkey->key_idx=%d frame "
399
399
"keyidx=%d priv=%p\n" , tkey -> key_idx , keyidx , priv );
400
400
return -6 ;
401
401
}
402
402
if (!tkey -> key_set ) {
403
403
if (net_ratelimit ()) {
404
- printk ( KERN_DEBUG "TKIP: received packet from %pM"
404
+ netdev_dbg ( skb -> dev , "TKIP: received packet from %pM"
405
405
" with keyid=%d that does not have a configured"
406
406
" key\n" , hdr -> addr2 , keyidx );
407
407
}
@@ -417,7 +417,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
417
417
if (iv32 < tkey -> rx_iv32 ||
418
418
(iv32 == tkey -> rx_iv32 && iv16 <= tkey -> rx_iv16 )) {
419
419
if (net_ratelimit ()) {
420
- printk ( KERN_DEBUG "TKIP: replay detected: STA=%pM"
420
+ netdev_dbg ( skb -> dev , "TKIP: replay detected: STA=%pM"
421
421
" previous TSC %08x%04x received TSC "
422
422
"%08x%04x\n" , hdr -> addr2 ,
423
423
tkey -> rx_iv32 , tkey -> rx_iv16 , iv32 , iv16 );
@@ -445,7 +445,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
445
445
skcipher_request_zero (req );
446
446
if (err ) {
447
447
if (net_ratelimit ()) {
448
- printk ( KERN_DEBUG ": TKIP: failed to decrypt "
448
+ netdev_dbg ( skb -> dev , " TKIP: failed to decrypt "
449
449
"received packet from %pM\n" ,
450
450
hdr -> addr2 );
451
451
}
@@ -468,7 +468,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
468
468
tkey -> rx_phase1_done = 0 ;
469
469
}
470
470
if (net_ratelimit ()) {
471
- printk ( KERN_DEBUG "TKIP: ICV error detected: STA="
471
+ netdev_dbg ( skb -> dev , "TKIP: ICV error detected: STA="
472
472
"%pM\n" , hdr -> addr2 );
473
473
}
474
474
tkey -> dot11RSNAStatsTKIPICVErrors ++ ;
@@ -559,7 +559,7 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
559
559
hdr = (struct rtl_80211_hdr_4addr * )skb -> data ;
560
560
561
561
if (skb_tailroom (skb ) < 8 || skb -> len < hdr_len ) {
562
- printk ( KERN_DEBUG "Invalid packet for Michael MIC add "
562
+ netdev_dbg ( skb -> dev , "Invalid packet for Michael MIC add "
563
563
"(tailroom=%d hdr_len=%d skb->len=%d)\n" ,
564
564
skb_tailroom (skb ), hdr_len , skb -> len );
565
565
return -1 ;
@@ -628,10 +628,9 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
628
628
struct rtl_80211_hdr_4addr * hdr ;
629
629
hdr = (struct rtl_80211_hdr_4addr * )skb -> data ;
630
630
631
- printk ( KERN_DEBUG "%s: Michael MIC verification failed for "
631
+ netdev_dbg ( skb -> dev , " Michael MIC verification failed for "
632
632
"MSDU from %pM keyidx=%d\n" ,
633
- skb -> dev ? skb -> dev -> name : "N/A" , hdr -> addr2 ,
634
- keyidx );
633
+ hdr -> addr2 , keyidx );
635
634
if (skb -> dev )
636
635
ieee80211_michael_mic_failure (skb -> dev , hdr , keyidx );
637
636
tkey -> dot11RSNAStatsTKIPLocalMICFailures ++ ;
0 commit comments