aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-08-20 19:25:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-25 14:33:17 -0400
commit0fb9a9ec27718fbf7fa3153bc94becefb716ceeb (patch)
tree8f5d6a5fa9f2c6b8b08273dc198d6187d0a70361 /net/mac80211/mlme.c
parentb62177a0aa0521fd07cd7501534c0c3b256ebce6 (diff)
net/mac80211: Use wiphy_<level>
Standardize logging messages from printk(KERN_<level> "%s: " fmt , wiphy_name(foo), args); to wiphy_<level>(foo, fmt, args); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 38996a44aa8e..5282ac18d2cf 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -778,16 +778,17 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
778 params.uapsd = uapsd; 778 params.uapsd = uapsd;
779 779
780#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 780#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
781 printk(KERN_DEBUG "%s: WMM queue=%d aci=%d acm=%d aifs=%d " 781 wiphy_debug(local->hw.wiphy,
782 "cWmin=%d cWmax=%d txop=%d uapsd=%d\n", 782 "WMM queue=%d aci=%d acm=%d aifs=%d "
783 wiphy_name(local->hw.wiphy), queue, aci, acm, 783 "cWmin=%d cWmax=%d txop=%d uapsd=%d\n",
784 params.aifs, params.cw_min, params.cw_max, params.txop, 784 queue, aci, acm,
785 params.uapsd); 785 params.aifs, params.cw_min, params.cw_max,
786 params.txop, params.uapsd);
786#endif 787#endif
787 if (drv_conf_tx(local, queue, &params)) 788 if (drv_conf_tx(local, queue, &params))
788 printk(KERN_DEBUG "%s: failed to set TX queue " 789 wiphy_debug(local->hw.wiphy,
789 "parameters for queue %d\n", 790 "failed to set TX queue parameters for queue %d\n",
790 wiphy_name(local->hw.wiphy), queue); 791 queue);
791 } 792 }
792 793
793 /* enable WMM or activate new settings */ 794 /* enable WMM or activate new settings */