2021-04-07 17:43:14

by Jiapeng Chong

Subject: [PATCH] staging: rtl8723bs: remove unused variable

Fix the following gcc warning:

drivers/staging/rtl8723bs/core/rtw_ieee80211.c:657:15: warning: variable
‘sec_idx’ set but not used [-Wunused-but-set-variable].

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index be4cffc..df00a79 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -654,7 +654,7 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)

void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, u16 *wpa_len)
{
- u8 authmode, sec_idx, i;
+ u8 authmode, i;
u8 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};
uint cnt;

@@ -662,13 +662,11 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie

cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);

- sec_idx = 0;
-
while (cnt < in_len) {
authmode = in_ie[cnt];

if ((authmode == WLAN_EID_VENDOR_SPECIFIC) && (!memcmp(&in_ie[cnt+2], &wpa_oui[0], 4))) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\n rtw_get_wpa_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n", sec_idx, in_ie[cnt+1]+2));
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\n in_ie[cnt+1]+2 =%d\n", in_ie[cnt+1]+2));

if (wpa_ie) {
memcpy(wpa_ie, &in_ie[cnt], in_ie[cnt+1]+2);
@@ -684,7 +682,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie
cnt += in_ie[cnt+1]+2; /* get next */
} else {
if (authmode == WLAN_EID_RSN) {
- RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\n get_rsn_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n", sec_idx, in_ie[cnt+1]+2));
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\n in_ie[cnt+1]+2 =%d\n", in_ie[cnt+1]+2));

if (rsn_ie) {
memcpy(rsn_ie, &in_ie[cnt], in_ie[cnt+1]+2);
--
1.8.3.1

2021-04-07 20:34:38

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: rtl8723bs: remove unused variable

On Wed, Apr 07, 2021 at 11:18:19AM +0800, Jiapeng Chong wrote:
> Fix the following gcc warning:
>
> drivers/staging/rtl8723bs/core/rtw_ieee80211.c:657:15: warning: variable
> ‘sec_idx’ set but not used [-Wunused-but-set-variable].
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)

This does not apply to my tree anymore, please update your branch and
rebase and resend.

thanks,

greg k-h