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>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index a9211cc183cbaecc2c0f6a773b3e6ed8637f2e5e..3f47276caeb85dcf7244270ff64d461979537be1 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1122,8 +1122,8 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
        p.txop = params->txop;
        if (drv_conf_tx(local, params->queue, &p)) {
                printk(KERN_DEBUG "%s: failed to set TX queue "
-                      "parameters for queue %d\n", local->mdev->name,
-                      params->queue);
+                      "parameters for queue %d\n",
+                      wiphy_name(local->hw.wiphy), params->queue);
                return -EINVAL;
        }
 

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 509469cb9265f4aedec40e5e4c1015d89d75f73c..e8a3d3cb80dfbee43fef593f17fd9caeb0d11543 100644 (file)
--- 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);
        }
 }