ath9k: merge a pending aggregation fix

[openwrt.git] / package / mac80211 / patches / 400-ath_move_debug_code.patch

diff --git a/package/mac80211/patches/400-ath_move_debug_code.patch b/package/mac80211/patches/400-ath_move_debug_code.patch
index 2584298..c322dd3 100644 (file)
--- a/package/mac80211/patches/400-ath_move_debug_code.patch
+++ b/package/mac80211/patches/400-ath_move_debug_code.patch
@@ -9,3 +9,19 @@
 -ath-$(CONFIG_ATH_DEBUG) += debug.o
 +              key.o \
 +              debug.o
+--- a/drivers/net/wireless/ath/ath.h
++++ b/drivers/net/wireless/ath/ath.h
+@@ -272,13 +272,6 @@ void ath_dbg(struct ath_common *common, 
+ #endif /* CONFIG_ATH_DEBUG */
+ 
+ /** Returns string describing opmode, or NULL if unknown mode. */
+-#ifdef CONFIG_ATH_DEBUG
+ const char *ath_opmode_to_string(enum nl80211_iftype opmode);
+-#else
+-static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
+-{
+-      return "UNKNOWN";
+-}
+-#endif
+ 
+ #endif /* ATH_H */