mac80211: don't use master netdev name

Always use the wiphy name instead.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 509469cb9265..e8a3d3cb80df 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -793,13 +793,13 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
                 printk(KERN_DEBUG "%s: WMM queue=%d aci=%d acm=%d aifs=%d "
                        "cWmin=%d cWmax=%d txop=%d\n",
-                       local->mdev->name, queue, aci, acm, params.aifs, params.cw_min,
-                       params.cw_max, params.txop);
+                       wiphy_name(local->hw.wiphy), queue, aci, acm,
+                       params.aifs, params.cw_min, params.cw_max, params.txop);
 #endif
                 if (drv_conf_tx(local, queue, &params) && local->ops->conf_tx)
                         printk(KERN_DEBUG "%s: failed to set TX queue "
-                               "parameters for queue %d\n", local->mdev->name,
-                               queue);
+                               "parameters for queue %d\n",
+                               wiphy_name(local->hw.wiphy), queue);
         }
 }