aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMANE Toshiaki <yamanetoshi@gmail.com>2012-11-28 08:20:40 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 11:31:46 -0500
commit73b612b14c1cd98f7b64e1f0d5ddbd736fcb063f (patch)
tree2e0522962a767dad73bd71c38179e030c4c8ea08
parent9e2c0a6bb7f0cfac8cb6dea9866c449d5ae97673 (diff)
staging/rtl8187se: Use netdev_ printks in ieee80211/ieee80211_rx.c
The following warnings fixed. - WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... - WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ... - WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
index 43e344a92d17..f14901df0e60 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
@@ -308,9 +308,9 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
308 if (ieee->tkip_countermeasures && 308 if (ieee->tkip_countermeasures &&
309 strcmp(crypt->ops->name, "TKIP") == 0) { 309 strcmp(crypt->ops->name, "TKIP") == 0) {
310 if (net_ratelimit()) { 310 if (net_ratelimit()) {
311 printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " 311 netdev_dbg(ieee->dev,
312 "received packet from %pM\n", 312 "TKIP countermeasures: dropped received packet from %pM\n",
313 ieee->dev->name, hdr->addr2); 313 ieee->dev->name, hdr->addr2);
314 } 314 }
315 return -1; 315 return -1;
316 } 316 }
@@ -353,9 +353,9 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *s
353 res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv); 353 res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
354 atomic_dec(&crypt->refcnt); 354 atomic_dec(&crypt->refcnt);
355 if (res < 0) { 355 if (res < 0) {
356 printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed" 356 netdev_dbg(ieee->dev,
357 " (SA=%pM keyidx=%d)\n", 357 "MSDU decryption/MIC verification failed (SA=%pM keyidx=%d)\n",
358 ieee->dev->name, hdr->addr2, keyidx); 358 hdr->addr2, keyidx);
359 return -1; 359 return -1;
360 } 360 }
361 361
@@ -409,7 +409,8 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
409 if (p == &ieee->ibss_mac_hash[index]) { 409 if (p == &ieee->ibss_mac_hash[index]) {
410 entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC); 410 entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC);
411 if (!entry) { 411 if (!entry) {
412 printk(KERN_WARNING "Cannot malloc new mac entry\n"); 412 netdev_warn(ieee->dev,
413 "Cannot malloc new mac entry\n");
413 return 0; 414 return 0;
414 } 415 }
415 memcpy(entry->mac, mac, ETH_ALEN); 416 memcpy(entry->mac, mac, ETH_ALEN);
@@ -491,8 +492,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
491 stats = &ieee->stats; 492 stats = &ieee->stats;
492 493
493 if (skb->len < 10) { 494 if (skb->len < 10) {
494 printk(KERN_INFO "%s: SKB length < 10\n", 495 netdev_info(ieee->dev, "SKB length < 10\n");
495 dev->name);
496 goto rx_dropped; 496 goto rx_dropped;
497 } 497 }
498 498
@@ -646,9 +646,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
646 flen -= hdrlen; 646 flen -= hdrlen;
647 647
648 if (frag_skb->tail + flen > frag_skb->end) { 648 if (frag_skb->tail + flen > frag_skb->end) {
649 printk(KERN_WARNING "%s: host decrypted and " 649 netdev_warn(ieee->dev,
650 "reassembled frame did not fit skb\n", 650 "host decrypted and reassembled frame did not fit skb\n");
651 dev->name);
652 ieee80211_frag_cache_invalidate(ieee, hdr); 651 ieee80211_frag_cache_invalidate(ieee, hdr);
653 goto rx_dropped; 652 goto rx_dropped;
654 } 653 }