diff options
author | Joe Perches <joe@perches.com> | 2010-08-20 18:13:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 15:19:44 -0400 |
commit | 9c376639297d3dd82d40e54c9cdca8da9dfc22f1 (patch) | |
tree | 4efdf23817f1ab3d90783f0f6335109537f174fd /net/wireless | |
parent | 78381c41776572cb642a485219c5d7651f198fbd (diff) |
include/net/cfg80211.h: wiphy_<level> messages use dev_printk
The output becomes:
[ 41.261941] ieee80211 phy0: Selected rate control algorithm 'minstrel_ht'
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/core.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index d52630bbab04..b8191cf86226 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -912,52 +912,3 @@ static void __exit cfg80211_exit(void) | |||
912 | destroy_workqueue(cfg80211_wq); | 912 | destroy_workqueue(cfg80211_wq); |
913 | } | 913 | } |
914 | module_exit(cfg80211_exit); | 914 | module_exit(cfg80211_exit); |
915 | |||
916 | static int ___wiphy_printk(const char *level, const struct wiphy *wiphy, | ||
917 | struct va_format *vaf) | ||
918 | { | ||
919 | if (!wiphy) | ||
920 | return printk("%s(NULL wiphy *): %pV", level, vaf); | ||
921 | |||
922 | return printk("%s%s: %pV", level, wiphy_name(wiphy), vaf); | ||
923 | } | ||
924 | |||
925 | int __wiphy_printk(const char *level, const struct wiphy *wiphy, | ||
926 | const char *fmt, ...) | ||
927 | { | ||
928 | struct va_format vaf; | ||
929 | va_list args; | ||
930 | int r; | ||
931 | |||
932 | va_start(args, fmt); | ||
933 | |||
934 | vaf.fmt = fmt; | ||
935 | vaf.va = &args; | ||
936 | |||
937 | r = ___wiphy_printk(level, wiphy, &vaf); | ||
938 | va_end(args); | ||
939 | |||
940 | return r; | ||
941 | } | ||
942 | EXPORT_SYMBOL(__wiphy_printk); | ||
943 | |||
944 | #define define_wiphy_printk_level(func, kern_level) \ | ||
945 | int func(const struct wiphy *wiphy, const char *fmt, ...) \ | ||
946 | { \ | ||
947 | struct va_format vaf; \ | ||
948 | va_list args; \ | ||
949 | int r; \ | ||
950 | \ | ||
951 | va_start(args, fmt); \ | ||
952 | \ | ||
953 | vaf.fmt = fmt; \ | ||
954 | vaf.va = &args; \ | ||
955 | \ | ||
956 | r = ___wiphy_printk(kern_level, wiphy, &vaf); \ | ||
957 | va_end(args); \ | ||
958 | \ | ||
959 | return r; \ | ||
960 | } \ | ||
961 | EXPORT_SYMBOL(func); | ||
962 | |||
963 | define_wiphy_printk_level(wiphy_debug, KERN_DEBUG); | ||