mac80211: don't use master netdev name
Johannes Berg
maintainerPATCH 1/1 mac80211: don't use master netdev name
Always use the wiphy name instead.
--- net/mac80211/cfg.c | 4 ++-- net/mac80211/mlme.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
net/mac80211/mlme.c +4 -4
@@ -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, ¶ms) && 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); } }
net/mac80211/cfg.c +2 -2
@@ -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 ; }
Quoted 1 line · Johannes Berg
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.
Signature · 2 lines
Regards, Pavel Roskin
Johannes Berg
maintainerQuoted 5 lines · Pavel Roskin
Quoted 1 line · Johannes Berg
Always use the wiphy name instead.
No objections against the patch.
Quoted 8 lines
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
Quoted 5 lines · Johannes Berg
Quoted 2 lines
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!
Signature · 2 lines
Regards, Pavel Roskin
Hi Johannes,
Quoted 10 lines
Quoted 10 lines
Quoted 1 line
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.
Quoted 5 lines
Quoted 2 lines
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