From 703515f889124248480f39d65f8704548cbf1c09 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 24 Feb 2017 11:57:27 +0100 Subject: mac80211: sync with master branch as of 9edff13abd97 Includes the following changes: 9edff13abd mac80211: disable potentially harmful PS software retry for A-MPDU sessions 75216a76b0 mac80211: backport upstream fix for CSA in IBSS mode 368cc8ef47 mac80211: update brcmfmac backporting brcmf_err cleanups 66a63d25c4 mac80211: fix build on linux 3.18 9eacb9d7fc rt2x00: mt7620: lots of improvements fd94fa61a7 mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9 649e766a64 mac80211: update to wireless-testing 2017-01-31 47540afa5d ath9k: add a warning to the tx99 config option b367eef21d mac80211: rt2x00: add support for external LNA on MT7620 9200e168f2 mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau --- ...-helper-to-get-the-string-representation-.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 package/kernel/mac80211/patches/327-ath9k-add-a-helper-to-get-the-string-representation-.patch (limited to 'package/kernel/mac80211/patches/327-ath9k-add-a-helper-to-get-the-string-representation-.patch') diff --git a/package/kernel/mac80211/patches/327-ath9k-add-a-helper-to-get-the-string-representation-.patch b/package/kernel/mac80211/patches/327-ath9k-add-a-helper-to-get-the-string-representation-.patch deleted file mode 100644 index c191495..0000000 --- a/package/kernel/mac80211/patches/327-ath9k-add-a-helper-to-get-the-string-representation-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 25b8b2d57def4854558c135228a52326a7d346ad Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Sun, 16 Oct 2016 22:59:06 +0200 -Subject: [PATCH 2/3] ath9k: add a helper to get the string representation of - ath_bus_type - -This can be used when the ath_bus_type has to be presented in a log -message or firmware filename. - -Signed-off-by: Martin Blumenstingl -Signed-off-by: Kalle Valo ---- - drivers/net/wireless/ath/ath.h | 6 ++++++ - drivers/net/wireless/ath/main.c | 7 +++++++ - 2 files changed, 13 insertions(+) - ---- a/drivers/net/wireless/ath/ath.h -+++ b/drivers/net/wireless/ath/ath.h -@@ -327,4 +327,10 @@ static inline const char *ath_opmode_to_ - } - #endif - -+extern const char *ath_bus_type_strings[]; -+static inline const char *ath_bus_type_to_string(enum ath_bus_type bustype) -+{ -+ return ath_bus_type_strings[bustype]; -+} -+ - #endif /* ATH_H */ ---- a/drivers/net/wireless/ath/main.c -+++ b/drivers/net/wireless/ath/main.c -@@ -90,3 +90,10 @@ void ath_printk(const char *level, const - va_end(args); - } - EXPORT_SYMBOL(ath_printk); -+ -+const char *ath_bus_type_strings[] = { -+ [ATH_PCI] = "pci", -+ [ATH_AHB] = "ahb", -+ [ATH_USB] = "usb", -+}; -+EXPORT_SYMBOL(ath_bus_type_strings); -- cgit v1.1