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

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

[Johannes Berg]

Always use the wiphy name instead.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 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;
 	}
 

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

[Pavel Roskin]

On Tue, 2009-06-09 at 16:18 +0200, Johannes Berg wrote:
> Always use the wiphy name instead.

No objections against the patch.

Maybe we could use wiphy names for the network devices?  That is,
wmaster0 would become phy0 and so on.  Using two names for the same
thing is confusing.  What's better is that we won't have wmaster0
corresponding to phy1 after the driver is reloaded.  We'll have "phy1"
in both namespaces.

I wish we could hide those master devices using some "hidden network
device" attribute, but it's not happening.

-- 
Regards,
Pavel Roskin

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

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 717 bytes --]

On Tue, 2009-06-09 at 10:47 -0400, Pavel Roskin wrote:
> On Tue, 2009-06-09 at 16:18 +0200, Johannes Berg wrote:
> > Always use the wiphy name instead.
> 
> No objections against the patch.
> 
> Maybe we could use wiphy names for the network devices?  That is,
> wmaster0 would become phy0 and so on.  Using two names for the same
> thing is confusing.  What's better is that we won't have wmaster0
> corresponding to phy1 after the driver is reloaded.  We'll have "phy1"
> in both namespaces.
> 
> I wish we could hide those master devices using some "hidden network
> device" attribute, but it's not happening.

Actually, the reason I'm posting this patch is that I'm killing the
mdev.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

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

[Pavel Roskin]

On Tue, 2009-06-09 at 16:49 +0200, Johannes Berg wrote:
> > I wish we could hide those master devices using some "hidden network
> > device" attribute, but it's not happening.
> 
> Actually, the reason I'm posting this patch is that I'm killing the
> mdev.

:-)
Excellent!

-- 
Regards,
Pavel Roskin

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

[Marcel Holtmann]

Hi Johannes,

> > > Always use the wiphy name instead.
> > 
> > No objections against the patch.
> > 
> > Maybe we could use wiphy names for the network devices?  That is,
> > wmaster0 would become phy0 and so on.  Using two names for the same
> > thing is confusing.  What's better is that we won't have wmaster0
> > corresponding to phy1 after the driver is reloaded.  We'll have "phy1"
> > in both namespaces.
> > 
> > I wish we could hide those master devices using some "hidden network
> > device" attribute, but it's not happening.
> 
> Actually, the reason I'm posting this patch is that I'm killing the
> mdev.

/me making a happy dance ;)

Regards

Marcel