aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_sta.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/ieee80211_sta.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/ieee80211_sta.c')
-rw-r--r--net/mac80211/ieee80211_sta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index f47cbd294ceb..8a4f2441b59c 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -3104,7 +3104,7 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
3104 } 3104 }
3105 3105
3106 printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n", 3106 printk(KERN_DEBUG "%s: Adding new IBSS station %s (dev=%s)\n",
3107 local->mdev->name, print_mac(mac, addr), dev->name); 3107 wiphy_name(local->hw.wiphy), print_mac(mac, addr), dev->name);
3108 3108
3109 sta = sta_info_add(local, dev, addr, GFP_ATOMIC); 3109 sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
3110 if (!sta) 3110 if (!sta)