openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
YAMANE Toshiaki 2012-11-28 22:20:40 +09:00 committed by Greg Kroah-Hartman
parent 9e2c0a6bb7
commit 73b612b14c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
View File

@ -308,9 +308,9 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
if (ieee->tkip_countermeasures && if (ieee->tkip_countermeasures &&
strcmp(crypt->ops->name, "TKIP") == 0) { strcmp(crypt->ops->name, "TKIP") == 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " netdev_dbg(ieee->dev,
"received packet from %pM\n", "TKIP countermeasures: dropped received packet from %pM\n",
ieee->dev->name, hdr->addr2); ieee->dev->name, hdr->addr2);
} }
return -1; return -1;
} }
@ -353,9 +353,9 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *s
res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv); res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed" netdev_dbg(ieee->dev,
" (SA=%pM keyidx=%d)\n", "MSDU decryption/MIC verification failed (SA=%pM keyidx=%d)\n",
ieee->dev->name, hdr->addr2, keyidx); hdr->addr2, keyidx);
return -1; return -1;
} }
@ -409,7 +409,8 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
if (p == &ieee->ibss_mac_hash[index]) { if (p == &ieee->ibss_mac_hash[index]) {
entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC); entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC);
if (!entry) { if (!entry) {
printk(KERN_WARNING "Cannot malloc new mac entry\n"); netdev_warn(ieee->dev,
"Cannot malloc new mac entry\n");
return 0; return 0;
} }
memcpy(entry->mac, mac, ETH_ALEN); memcpy(entry->mac, mac, ETH_ALEN);
@ -491,8 +492,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
stats = &ieee->stats; stats = &ieee->stats;
if (skb->len < 10) { if (skb->len < 10) {
printk(KERN_INFO "%s: SKB length < 10\n", netdev_info(ieee->dev, "SKB length < 10\n");
dev->name);
goto rx_dropped; goto rx_dropped;
} }
@ -646,9 +646,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
flen -= hdrlen; flen -= hdrlen;
if (frag_skb->tail + flen > frag_skb->end) { if (frag_skb->tail + flen > frag_skb->end) {
printk(KERN_WARNING "%s: host decrypted and " netdev_warn(ieee->dev,
"reassembled frame did not fit skb\n", "host decrypted and reassembled frame did not fit skb\n");
dev->name);
ieee80211_frag_cache_invalidate(ieee, hdr); ieee80211_frag_cache_invalidate(ieee, hdr);
goto rx_dropped; goto rx_dropped;
} }