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 --- ...drop-brcmf_bus_detach-and-inline-its-code.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch (limited to 'package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch') diff --git a/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch b/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch deleted file mode 100644 index 13e5d52..0000000 --- a/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bfa7295e5b4d32cdab28d4cdc3a9791f73aed089 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 18 Jan 2017 11:48:53 +0100 -Subject: [PATCH] brcmfmac: drop brcmf_bus_detach and inline its code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Driver used to call brcmf_bus_detach only from one place and it already -contained a check for drvr not being NULL. We can get rid of this extra -function, call brcmf_bus_stop directly and simplify the code. -There also isn't brcmf_bus_attach function which one could expect so it -looks more consistent this way. - -Signed-off-by: Rafał Miłecki -Acked-by: Arend van Spriel -Signed-off-by: Kalle Valo ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1075,16 +1075,6 @@ void brcmf_bus_add_txhdrlen(struct devic - } - } - --static void brcmf_bus_detach(struct brcmf_pub *drvr) --{ -- brcmf_dbg(TRACE, "Enter\n"); -- -- if (drvr) { -- /* Stop the bus module */ -- brcmf_bus_stop(drvr->bus_if); -- } --} -- - void brcmf_dev_reset(struct device *dev) - { - struct brcmf_bus *bus_if = dev_get_drvdata(dev); -@@ -1131,7 +1121,7 @@ void brcmf_detach(struct device *dev) - - brcmf_fws_deinit(drvr); - -- brcmf_bus_detach(drvr); -+ brcmf_bus_stop(drvr->bus_if); - - brcmf_proto_detach(drvr); - -- cgit v1.1