diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-09 09:37:53 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-09 10:29:01 +0200 |
| commit | c7f710e4744eb36cedd452129ee2c315dd6e92c9 (patch) | |
| tree | 7020410d0269df0a3f939cb5810fee9626773ae3 /package/kernel/mac80211/patches/brcm/386-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch | |
| parent | 6d2044d62f85b190d6279bf634efd00d55b28669 (diff) | |
| download | upstream-c7f710e4744eb36cedd452129ee2c315dd6e92c9.tar.gz upstream-c7f710e4744eb36cedd452129ee2c315dd6e92c9.tar.bz2 upstream-c7f710e4744eb36cedd452129ee2c315dd6e92c9.zip | |
mac80211: brcmfmac: backport more kernel 5.4 changes
Patch getting RAM info got upstreamed. A debugging fs entry for testing
reset feature was added.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 681acdcc54d2e59135bb706c38bed942f74ccf74)
Diffstat (limited to 'package/kernel/mac80211/patches/brcm/386-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/brcm/386-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/brcm/386-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch b/package/kernel/mac80211/patches/brcm/386-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch new file mode 100644 index 0000000000..4ba87ed093 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/386-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 +@@ -2974,8 +2974,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; +@@ -2999,12 +2997,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. +@@ -3016,7 +3011,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: |