lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: don't use master netdev name

Browse Source 
Always use the wiphy name instead.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2009-06-09 16:18:32 +02:00
committed by John W. Linville
parent 5eae6592e9
commit 0bffe40f21
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/cfg.c
View File

@@ -1122,8 +1122,8 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
p.txop = params->txop; p.txop = params->txop;
if (drv_conf_tx(local, params->queue, &p)) { if (drv_conf_tx(local, params->queue, &p)) {
printk(KERN_DEBUG "%s: failed to set TX queue " printk(KERN_DEBUG "%s: failed to set TX queue "
"parameters for queue %d\n", local->mdev->name, "parameters for queue %d\n",
params->queue); wiphy_name(local->hw.wiphy), params->queue);
return -EINVAL; return -EINVAL;
} }

8
net/mac80211/mlme.c
View File

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