commit dd1cd4c620c174ebbdf78dc01b924115a06de5d3
author Johannes Berg <johannes@sipsolutions.net> Tue Sep 18 17:29:20 2007 -0400
committer David S. Miller <davem@sunset.davemloft.net> Wed Oct 10 16:52:32 2007 -0700
tree a04517b9ee2ede228ec4a8ab96099460060c4245
parent 9c7d7728baf79c63ae58df95fb39ea13db487599

[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>

net/mac80211/sta_info.c

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 44d9834..7c7df87 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -166,7 +166,7 @@
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
 	printk(KERN_DEBUG "%s: Added STA %s\n",
-	       local->mdev->name, print_mac(mac, addr));
+	       wiphy_name(local->hw.wiphy), print_mac(mac, addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
 #ifdef CONFIG_MAC80211_DEBUGFS
@@ -226,7 +226,7 @@
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
 	printk(KERN_DEBUG "%s: Removed STA %s\n",
-	       local->mdev->name, print_mac(mac, sta->addr));
+	       wiphy_name(local->hw.wiphy), print_mac(mac, sta->addr));
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
 
 	ieee80211_key_free(sta->key);