Skip to content

Commit ea7a10e

Browse files
Sam Muhammedgregkh
authored andcommitted
Staging: rtl8192u: ieee80211: Use netdev_dbg() for debug messages.
Replace printk(KERN_DEBUG ...) with netdev_dbg() across the driver. since netdev_dbg() is preferable and specific for printing debug messages for network devices. Signed-off-by: Sam Muhammed <[email protected]> Link: https://lore.kernel.org/r/84dc7e33954509457efce2a35fb293e631845a96.1585233434.git.jane.pnx9@gmail.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 1165dd7 commit ea7a10e

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -388,20 +388,20 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
388388
keyidx = pos[3];
389389
if (!(keyidx & BIT(5))) {
390390
if (net_ratelimit()) {
391-
printk(KERN_DEBUG "TKIP: received packet without ExtIV"
391+
netdev_dbg(skb->dev, "TKIP: received packet without ExtIV"
392392
" flag from %pM\n", hdr->addr2);
393393
}
394394
return -2;
395395
}
396396
keyidx >>= 6;
397397
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 "
399399
"keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv);
400400
return -6;
401401
}
402402
if (!tkey->key_set) {
403403
if (net_ratelimit()) {
404-
printk(KERN_DEBUG "TKIP: received packet from %pM"
404+
netdev_dbg(skb->dev, "TKIP: received packet from %pM"
405405
" with keyid=%d that does not have a configured"
406406
" key\n", hdr->addr2, keyidx);
407407
}
@@ -417,7 +417,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
417417
if (iv32 < tkey->rx_iv32 ||
418418
(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) {
419419
if (net_ratelimit()) {
420-
printk(KERN_DEBUG "TKIP: replay detected: STA=%pM"
420+
netdev_dbg(skb->dev, "TKIP: replay detected: STA=%pM"
421421
" previous TSC %08x%04x received TSC "
422422
"%08x%04x\n", hdr->addr2,
423423
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)
445445
skcipher_request_zero(req);
446446
if (err) {
447447
if (net_ratelimit()) {
448-
printk(KERN_DEBUG ": TKIP: failed to decrypt "
448+
netdev_dbg(skb->dev, "TKIP: failed to decrypt "
449449
"received packet from %pM\n",
450450
hdr->addr2);
451451
}
@@ -468,7 +468,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
468468
tkey->rx_phase1_done = 0;
469469
}
470470
if (net_ratelimit()) {
471-
printk(KERN_DEBUG "TKIP: ICV error detected: STA="
471+
netdev_dbg(skb->dev, "TKIP: ICV error detected: STA="
472472
"%pM\n", hdr->addr2);
473473
}
474474
tkey->dot11RSNAStatsTKIPICVErrors++;
@@ -559,7 +559,7 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
559559
hdr = (struct rtl_80211_hdr_4addr *)skb->data;
560560

561561
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 "
563563
"(tailroom=%d hdr_len=%d skb->len=%d)\n",
564564
skb_tailroom(skb), hdr_len, skb->len);
565565
return -1;
@@ -628,10 +628,9 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
628628
struct rtl_80211_hdr_4addr *hdr;
629629
hdr = (struct rtl_80211_hdr_4addr *)skb->data;
630630

631-
printk(KERN_DEBUG "%s: Michael MIC verification failed for "
631+
netdev_dbg(skb->dev, "Michael MIC verification failed for "
632632
"MSDU from %pM keyidx=%d\n",
633-
skb->dev ? skb->dev->name : "N/A", hdr->addr2,
634-
keyidx);
633+
hdr->addr2, keyidx);
635634
if (skb->dev)
636635
ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);
637636
tkey->dot11RSNAStatsTKIPLocalMICFailures++;

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,8 @@ int ieee80211_encrypt_fragment(
180180
struct rtl_80211_hdr_3addrqos *header;
181181

182182
header = (struct rtl_80211_hdr_3addrqos *)frag->data;
183-
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
184-
"TX packet to %pM\n",
185-
ieee->dev->name, header->addr1);
183+
netdev_dbg(ieee->dev, "TKIP countermeasures: dropped "
184+
"TX packet to %pM\n", header->addr1);
186185
}
187186
return -1;
188187
}

drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
436436
if (ieee->reset_on_keychange &&
437437
ieee->iw_mode != IW_MODE_INFRA &&
438438
ieee->reset_port && ieee->reset_port(dev)) {
439-
printk(KERN_DEBUG "%s: reset_port failed\n", dev->name);
439+
netdev_dbg(ieee->dev, "reset_port failed\n");
440440
return -EINVAL;
441441
}
442442
return 0;

0 commit comments

Comments
 (0)