aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-02 12:02:22 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-06 12:27:12 +0100
commit649e766a64a0d001f040dfc225c601b3d0af6f40 (patch)
tree6399891552e85e9d511546df07932551f60b7549 /package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch
parent91fce81df6e99cec0876b9d4866bd86e7c49820f (diff)
downloadupstream-649e766a64a0d001f040dfc225c601b3d0af6f40.tar.gz
upstream-649e766a64a0d001f040dfc225c601b3d0af6f40.tar.bz2
upstream-649e766a64a0d001f040dfc225c601b3d0af6f40.zip
mac80211: update to wireless-testing 2017-01-31
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch')
-rw-r--r--package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch49
1 files changed, 0 insertions, 49 deletions
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 13e5d52bd0..0000000000
--- 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?= <rafal@milecki.pl>
-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 <rafal@milecki.pl>
-Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- 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);
-