summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-18 23:29:20 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-11 01:52:32 +0200
commitdd1cd4c620c174ebbdf78dc01b924115a06de5d3 (patch)
treea04517b9ee2ede228ec4a8ab96099460060c4245 /net/mac80211/tx.c
parent[MAC80211]: remove tx info sw_retry_attempt member (diff)
downloadlinux-dd1cd4c620c174ebbdf78dc01b924115a06de5d3.tar.xz
linux-dd1cd4c620c174ebbdf78dc01b924115a06de5d3.zip
[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/tx.c')
-rw-r--r--net/mac80211/tx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e33f7641e6b4..38394c40f6ad 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -324,7 +324,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local)
local->total_ps_buffered = total;
printk(KERN_DEBUG "%s: PS buffers full - purged %d frames\n",
- local->mdev->name, purged);
+ wiphy_name(local->hw.wiphy), purged);
}
static inline ieee80211_txrx_result
@@ -1049,7 +1049,8 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
return IEEE80211_TX_AGAIN;
}
if (skb) {
- ieee80211_dump_frame(local->mdev->name, "TX to low-level driver", skb);
+ ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
+ "TX to low-level driver", skb);
ret = local->ops->tx(local_to_hw(local), skb, control);
if (ret)
return IEEE80211_TX_AGAIN;
@@ -1077,7 +1078,7 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
~IEEE80211_TXCTL_RATE_CTRL_PROBE;
}
- ieee80211_dump_frame(local->mdev->name,
+ ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
"TX to low-level driver",
tx->u.tx.extra_frag[i]);
ret = local->ops->tx(local_to_hw(local),
@@ -1799,7 +1800,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
if (!rate) {
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
- "found\n", local->mdev->name);
+ "found\n", wiphy_name(local->hw.wiphy));
}
dev_kfree_skb(skb);
return NULL;