Commit a21a773f authored Jun 10, 2019 by Nishka Dasgupta Committed by Greg Kroah-Hartman Jun 13, 2019

staging: rtl8723bs: rtw_get_sec_ie(): Change return type



Remove assignment of return value of function rtw_get_sec_ie as it is
never checked or used.
Remove return statement of rtw_get_sec_ie as its return value is never
stored or checked or used.
Change return type of rtw_get_sec_ie to void.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fc98ef8f

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -654,7 +654,7 @@ int rtw_get_wapi_ie(u8 in_ie, uint in_len, u8 wapi_ie, u16 *wapi_len)
		}
		/* endif */

		int rtw_get_sec_ie(u8 in_ie, uint in_len, u8 rsn_ie, u16 rsn_len, u8 wpa_ie, u16 *wpa_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 wpa_oui[4] = {0x0, 0x50, 0xf2, 0x01};
		@@ -705,8 +705,6 @@ int rtw_get_sec_ie(u8 in_ie, uint in_len, u8 rsn_ie, u16 rsn_len, u8 wpa_ie,
		}
		}
		}

		return rsn_len + wpa_len;
		}

		u8 rtw_is_wps_ie(u8 ie_ptr, uint wps_ielen)

drivers/staging/rtl8723bs/include/ieee80211.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1138,7 +1138,7 @@ int rtw_get_wapi_ie(u8 in_ie, uint in_len, u8 wapi_ie, u16 *wapi_len);
		int rtw_parse_wpa_ie(u8 wpa_ie, int wpa_ie_len, int group_cipher, int pairwise_cipher, int is_8021x);
		int rtw_parse_wpa2_ie(u8 wpa_ie, int wpa_ie_len, int group_cipher, int pairwise_cipher, int is_8021x);

		int rtw_get_sec_ie(u8 in_ie, uint in_len, u8 rsn_ie, u16 rsn_len, u8 wpa_ie, u16 *wpa_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 rtw_is_wps_ie(u8 ie_ptr, uint wps_ielen);
		u8 rtw_get_wps_ie(u8 in_ie, uint in_len, u8 wps_ie, uint wps_ielen);

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -235,8 +235,7 @@ static char translate_scan(struct adapter padapter,
		u8 wpa_ie[255], rsn_ie[255];
		u16 wpa_len = 0, rsn_len = 0;
		u8 *p;
		sint out_len = 0;
		out_len =rtw_get_sec_ie(pnetwork->network.IEs , pnetwork->network.IELength, rsn_ie,&rsn_len, wpa_ie,&wpa_len);
		rtw_get_sec_ie(pnetwork->network.IEs, pnetwork->network.IELength, rsn_ie, &rsn_len, wpa_ie, &wpa_len);
		RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_scan: ssid =%s\n", pnetwork->network.Ssid.Ssid));
		RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_scan: wpa_len =%d rsn_len =%d\n", wpa_len, rsn_len));