Commit 0bffe40f authored Jun 09, 2009 by Johannes Berg Committed by John W. Linville Jun 10, 2009

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>

parent 5eae6592

net/mac80211/cfg.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

net/mac80211/mlme.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}