aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-18 17:29:20 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:52:32 -0400
commitdd1cd4c620c174ebbdf78dc01b924115a06de5d3 (patch)
treea04517b9ee2ede228ec4a8ab96099460060c4245 /net/mac80211/rx.c
parent9c7d7728baf79c63ae58df95fb39ea13db487599 (diff)
[MAC80211]: print out wiphy name instead of master device
This makes mac80211 print out the wiphy name instead of the master device name where appropriate. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 9700c1c5b3cf..b5f2e4c25c7e 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1474,7 +1474,8 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
1474 if (net_ratelimit()) 1474 if (net_ratelimit())
1475 printk(KERN_DEBUG "%s: failed to copy " 1475 printk(KERN_DEBUG "%s: failed to copy "
1476 "multicast frame for %s", 1476 "multicast frame for %s",
1477 local->mdev->name, prev->dev->name); 1477 wiphy_name(local->hw.wiphy),
1478 prev->dev->name);
1478 continue; 1479 continue;
1479 } 1480 }
1480 rx.skb = skb_new; 1481 rx.skb = skb_new;