mac80211: brcmfmac: backport more kernel 5.4 changes

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / brcm / 106-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch

diff --git a/package/kernel/mac80211/patches/brcm/106-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch b/package/kernel/mac80211/patches/brcm/106-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch
new file mode 100644 (file)
index 0000000..da0d8d5
--- /dev/null
+++ b/package/kernel/mac80211/patches/brcm/106-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch
@@ -0,0 +1,54 @@
+From cddecd92d1ec2fd05ed1123455e7c6cf6906b5a5 Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Wed, 24 Jul 2019 22:12:01 +0800
+Subject: [PATCH] brcmfmac: remove set but not used variable 'dtim_period'
+
+Fixes gcc '-Wunused-but-set-variable' warning:
+
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function brcmf_update_bss_info:
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:2962:5: warning: variable dtim_period set but not used [-Wunused-but-set-variable]
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function brcmf_update_bss_info:
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:2961:6: warning: variable beacon_interval set but not used [-Wunused-but-set-variable]
+
+They are never used so can be removed.
+
+Reported-by: Hulk Robot <hulkci@huawei.com>
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c   | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+@@ -2982,8 +2982,6 @@ static s32 brcmf_update_bss_info(struct
+       struct brcmf_pub *drvr = cfg->pub;
+       struct brcmf_bss_info_le *bi;
+       const struct brcmf_tlv *tim;
+-      u16 beacon_interval;
+-      u8 dtim_period;
+       size_t ie_len;
+       u8 *ie;
+       s32 err = 0;
+@@ -3007,12 +3005,9 @@ static s32 brcmf_update_bss_info(struct
+ 
+       ie = ((u8 *)bi) + le16_to_cpu(bi->ie_offset);
+       ie_len = le32_to_cpu(bi->ie_length);
+-      beacon_interval = le16_to_cpu(bi->beacon_period);
+ 
+       tim = brcmf_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
+-      if (tim)
+-              dtim_period = tim->data[1];
+-      else {
++      if (!tim) {
+               /*
+               * active scan was done so we could not get dtim
+               * information out of probe response.
+@@ -3024,7 +3019,6 @@ static s32 brcmf_update_bss_info(struct
+                       bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);
+                       goto update_bss_info_out;
+               }
+-              dtim_period = (u8)var;
+       }
+ 
+ update_bss_info_out: