aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-08-20 19:25:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-25 14:33:17 -0400
commit0fb9a9ec27718fbf7fa3153bc94becefb716ceeb (patch)
tree8f5d6a5fa9f2c6b8b08273dc198d6187d0a70361 /net/mac80211/rx.c
parentb62177a0aa0521fd07cd7501534c0c3b256ebce6 (diff)
net/mac80211: Use wiphy_<level>
Standardize logging messages from printk(KERN_<level> "%s: " fmt , wiphy_name(foo), args); to wiphy_<level>(foo, fmt, args); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index aa41e382bbb3..e1844f7085de 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -605,10 +605,8 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
605 605
606#ifdef CONFIG_MAC80211_HT_DEBUG 606#ifdef CONFIG_MAC80211_HT_DEBUG
607 if (net_ratelimit()) 607 if (net_ratelimit())
608 printk(KERN_DEBUG "%s: release an RX reorder " 608 wiphy_debug(hw->wiphy,
609 "frame due to timeout on earlier " 609 "release an RX reorder frame due to timeout on earlier frames\n");
610 "frames\n",
611 wiphy_name(hw->wiphy));
612#endif 610#endif
613 ieee80211_release_reorder_frame(hw, tid_agg_rx, 611 ieee80211_release_reorder_frame(hw, tid_agg_rx,
614 j, frames); 612 j, frames);
@@ -2698,10 +2696,9 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
2698 skb_new = skb_copy(skb, GFP_ATOMIC); 2696 skb_new = skb_copy(skb, GFP_ATOMIC);
2699 if (!skb_new) { 2697 if (!skb_new) {
2700 if (net_ratelimit()) 2698 if (net_ratelimit())
2701 printk(KERN_DEBUG "%s: failed to copy " 2699 wiphy_debug(local->hw.wiphy,
2702 "multicast frame for %s\n", 2700 "failed to copy multicast frame for %s\n",
2703 wiphy_name(local->hw.wiphy), 2701 prev->name);
2704 prev->name);
2705 goto next; 2702 goto next;
2706 } 2703 }
2707 ieee80211_invoke_rx_handlers(prev, &rx, skb_new); 2704 ieee80211_invoke_rx_handlers(prev, &rx, skb_new);