From b00a170db9d65ade8c080fca8c49ac5ff671ec4c Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 30 Jul 2010 22:18:57 +0000
Subject: mac80211: update to 2010-07-29, add pending patches to fix further
 issues with calibration

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22419 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../mac80211/patches/130-printk_debug_revert.patch | 69 ++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 package/mac80211/patches/130-printk_debug_revert.patch

(limited to 'package/mac80211/patches/130-printk_debug_revert.patch')

diff --git a/package/mac80211/patches/130-printk_debug_revert.patch b/package/mac80211/patches/130-printk_debug_revert.patch
new file mode 100644
index 000000000..232902e8c
--- /dev/null
+++ b/package/mac80211/patches/130-printk_debug_revert.patch
@@ -0,0 +1,69 @@
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -2443,9 +2443,8 @@ void cfg80211_cqm_rssi_notify(struct net
+ 	wiphy_printk(KERN_NOTICE, wiphy, format, ##args)
+ #define wiphy_info(wiphy, format, args...)			\
+ 	wiphy_printk(KERN_INFO, wiphy, format, ##args)
+-
+-int wiphy_debug(const struct wiphy *wiphy, const char *format, ...)
+-	__attribute__ ((format (printf, 2, 3)));
++#define wiphy_debug(wiphy, format, args...)			\
++	wiphy_printk(KERN_DEBUG, wiphy, format, ##args)
+ 
+ #if defined(DEBUG)
+ #define wiphy_dbg(wiphy, format, args...)			\
+--- a/net/wireless/core.c
++++ b/net/wireless/core.c
+@@ -921,52 +921,3 @@ static void __exit cfg80211_exit(void)
+ 	destroy_workqueue(cfg80211_wq);
+ }
+ module_exit(cfg80211_exit);
+-
+-static int ___wiphy_printk(const char *level, const struct wiphy *wiphy,
+-			   struct va_format *vaf)
+-{
+-	if (!wiphy)
+-		return printk("%s(NULL wiphy *): %pV", level, vaf);
+-
+-	return printk("%s%s: %pV", level, wiphy_name(wiphy), vaf);
+-}
+-
+-int __wiphy_printk(const char *level, const struct wiphy *wiphy,
+-		   const char *fmt, ...)
+-{
+-	struct va_format vaf;
+-	va_list args;
+-	int r;
+-
+-	va_start(args, fmt);
+-
+-	vaf.fmt = fmt;
+-	vaf.va = &args;
+-
+-	r = ___wiphy_printk(level, wiphy, &vaf);
+-	va_end(args);
+-
+-	return r;
+-}
+-EXPORT_SYMBOL(__wiphy_printk);
+-
+-#define define_wiphy_printk_level(func, kern_level)		\
+-int func(const struct wiphy *wiphy, const char *fmt, ...)	\
+-{								\
+-	struct va_format vaf;					\
+-	va_list args;						\
+-	int r;							\
+-								\
+-	va_start(args, fmt);					\
+-								\
+-	vaf.fmt = fmt;						\
+-	vaf.va = &args;						\
+-								\
+-	r = ___wiphy_printk(kern_level, wiphy, &vaf);		\
+-	va_end(args);						\
+-								\
+-	return r;						\
+-}								\
+-EXPORT_SYMBOL(func);
+-
+-define_wiphy_printk_level(wiphy_debug, KERN_DEBUG);
-- 
cgit v1.2.3