[PATCH] mac80211: don't use master netdev name

[Johannes Berg <johannes@xxxxxxxxxxxxxxxx>]

Always use the wiphy name instead.

Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
 net/mac80211/cfg.c  |    4 ++--
 net/mac80211/mlme.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

--- wireless-testing.orig/net/mac80211/mlme.c	2009-06-09 16:17:44.000000000 +0200
+++ wireless-testing/net/mac80211/mlme.c	2009-06-09 16:17:47.000000000 +0200
@@ -793,13 +793,13 @@ static void ieee80211_sta_wmm_params(str
 #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);
 	}
 }
 
--- wireless-testing.orig/net/mac80211/cfg.c	2009-06-09 16:17:44.000000000 +0200
+++ wireless-testing/net/mac80211/cfg.c	2009-06-09 16:17:47.000000000 +0200
@@ -1122,8 +1122,8 @@ static int ieee80211_set_txq_params(stru
 	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;
 	}
 


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html