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

1 files changed, 2 insertions, 2 deletions

diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c
index a1ded7449784..91a9fe2cbad9 100644
--- a/net/mac80211/ieee80211_rate.c
+++ b/net/mac80211/ieee80211_rate.c
@@ -152,7 +152,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
         ref = rate_control_alloc(name, local);
         if (!ref) {
                 printk(KERN_WARNING "%s: Failed to select rate control "
-                       "algorithm\n", local->mdev->name);
+                       "algorithm\n", wiphy_name(local->hw.wiphy));
                 return -ENOENT;
         }
 
@@ -164,7 +164,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
         }
 
         printk(KERN_DEBUG "%s: Selected rate control "
-               "algorithm '%s'\n", local->mdev->name,
+               "algorithm '%s'\n", wiphy_name(local->hw.wiphy),
                ref->ops->name);