summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.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 16:52:32 -0700
commitdd1cd4c620c174ebbdf78dc01b924115a06de5d3 (patch)
treea04517b9ee2ede228ec4a8ab96099460060c4245 /net/mac80211/sta_info.c
parent9c7d7728baf79c63ae58df95fb39ea13db487599 (diff)
downloadblackbird-op-linux-dd1cd4c620c174ebbdf78dc01b924115a06de5d3.tar.gz
blackbird-op-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/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 44d983404952..7c7df87f673c 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -166,7 +166,7 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
#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 @@ void sta_info_free(struct sta_info *sta)
#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);
OpenPOWER on IntegriCloud