Home Explore Help
Register Sign In
wareck
/
openwrt_lede
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 488fc98adf
Branches Tags
openwrt_lede
/
package
/
kernel
/
mac80211
/
patches
/
353-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch

353-v5.4-brcmfmac-remove-set-but-not-used-variable-dtim_perio.patch 2.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 
  1. From cddecd92d1ec2fd05ed1123455e7c6cf6906b5a5 Mon Sep 17 00:00:00 2001
    2. 

  2. From: YueHaibing <yuehaibing@huawei.com>
    3. 

  3. Date: Wed, 24 Jul 2019 22:12:01 +0800
    4. 

  4. Subject: [PATCH] brcmfmac: remove set but not used variable 'dtim_period'
    5. 

  5. 

  6. Fixes gcc '-Wunused-but-set-variable' warning:
    7. 

  7. 

  8. drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function brcmf_update_bss_info:
    9. 

  9. drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:2962:5: warning: variable dtim_period set but not used [-Wunused-but-set-variable]
    10. 

  10. drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function brcmf_update_bss_info:
    11. 

  11. drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:2961:6: warning: variable beacon_interval set but not used [-Wunused-but-set-variable]
    12. 

  12. 

  13. They are never used so can be removed.
    14. 

  14. 

  15. Reported-by: Hulk Robot <hulkci@huawei.com>
    16. 

  16. Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    17. 

  17. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    18. 

  18. ---
    19. 

  19.  .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c   | 8 +-------
    20. 

  20.  1 file changed, 1 insertion(+), 7 deletions(-)
    21. 

  21. 

  22. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
    23. 

  23. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
    24. 

  24. @@ -3033,8 +3033,6 @@ static s32 brcmf_update_bss_info(struct
    25. 

  25.  	struct brcmf_pub *drvr = cfg->pub;
    26. 

  26.  	struct brcmf_bss_info_le *bi;
    27. 

  27.  	const struct brcmf_tlv *tim;
    28. 

  28. -	u16 beacon_interval;
    29. 

  29. -	u8 dtim_period;
    30. 

  30.  	size_t ie_len;
    31. 

  31.  	u8 *ie;
    32. 

  32.  	s32 err = 0;
    33. 

  33. @@ -3058,12 +3056,9 @@ static s32 brcmf_update_bss_info(struct
    34. 

  34.  
    35. 

  35.  	ie = ((u8 *)bi) + le16_to_cpu(bi->ie_offset);
    36. 

  36.  	ie_len = le32_to_cpu(bi->ie_length);
    37. 

  37. -	beacon_interval = le16_to_cpu(bi->beacon_period);
    38. 

  38.  
    39. 

  39.  	tim = brcmf_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
    40. 

  40. -	if (tim)
    41. 

  41. -		dtim_period = tim->data[1];
    42. 

  42. -	else {
    43. 

  43. +	if (!tim) {
    44. 

  44.  		/*
    45. 

  45.  		* active scan was done so we could not get dtim
    46. 

  46.  		* information out of probe response.
    47. 

  47. @@ -3075,7 +3070,6 @@ static s32 brcmf_update_bss_info(struct
    48. 

  48.  			bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);
    49. 

  49.  			goto update_bss_info_out;
    50. 

  50.  		}
    51. 

  51. -		dtim_period = (u8)var;
    52. 

  52.  	}
    53. 

  53.  
    54. 

  54.  update_bss_info_out:
    55.