mac80211: Update to version 5.2-rc7

[openwrt/staging/lynxis.git] / package / kernel / mac80211 / patches / brcm / 305-v4.20-0001-brcmfmac-remove-set-but-not-used-variables-sfdoff-an.patch

diff --git a/package/kernel/mac80211/patches/brcm/305-v4.20-0001-brcmfmac-remove-set-but-not-used-variables-sfdoff-an.patch b/package/kernel/mac80211/patches/brcm/305-v4.20-0001-brcmfmac-remove-set-but-not-used-variables-sfdoff-an.patch
deleted file mode 100644 (file)
index 192ed1a..0000000
--- a/package/kernel/mac80211/patches/brcm/305-v4.20-0001-brcmfmac-remove-set-but-not-used-variables-sfdoff-an.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a8254fa4ba60b85829b6e5ede6564f81cd70d59f Mon Sep 17 00:00:00 2001
-From: YueHaibing <yuehaibing@huawei.com>
-Date: Tue, 11 Sep 2018 11:24:04 +0800
-Subject: [PATCH] brcmfmac: remove set but not used variables 'sfdoff' and
- 'pad_size'
-
-Fixes gcc '-Wunused-but-set-variable' warning:
-
-drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function 'brcmf_sdio_rxglom':
-drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:1466:11: warning:
- variable 'sfdoff' set but not used [-Wunused-but-set-variable]
-
-drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function 'brcmf_sdio_bus_preinit':
-drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:3408:7: warning:
- variable 'pad_size' set but not used [-Wunused-but-set-variable]
-
-Signed-off-by: YueHaibing <yuehaibing@huawei.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -1463,7 +1463,7 @@ static u8 brcmf_sdio_rxglom(struct brcmf
-       struct sk_buff *pfirst, *pnext;
- 
-       int errcode;
--      u8 doff, sfdoff;
-+      u8 doff;
- 
-       struct brcmf_sdio_hdrinfo rd_new;
- 
-@@ -1597,7 +1597,6 @@ static u8 brcmf_sdio_rxglom(struct brcmf
- 
-               /* Remove superframe header, remember offset */
-               skb_pull(pfirst, rd_new.dat_offset);
--              sfdoff = rd_new.dat_offset;
-               num = 0;
- 
-               /* Validate all the subframe headers */
-@@ -3405,7 +3404,6 @@ static int brcmf_sdio_bus_preinit(struct
-       struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
-       struct brcmf_sdio *bus = sdiodev->bus;
-       struct brcmf_core *core = bus->sdio_core;
--      uint pad_size;
-       u32 value;
-       int err;
- 
-@@ -3448,7 +3446,6 @@ static int brcmf_sdio_bus_preinit(struct
-       if (sdiodev->sg_support) {
-               bus->txglom = false;
-               value = 1;
--              pad_size = bus->sdiodev->func2->cur_blksize << 1;
-               err = brcmf_iovar_data_set(bus->sdiodev->dev, "bus:rxglom",
-                                          &value, sizeof(u32));
-               if (err < 0) {