Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af27bea4 authored by Aishwarya Pant's avatar Aishwarya Pant Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: fix sparse signedness warnings in rtw_get_ie 



Changed the type of len from (int *) to (unsigned int *) in the
function rtw_get_ie(..) and wherever this function is called to
suppress signedness mismatch warnings of the type-

drivers/staging/rtl8188eu//core/rtw_ap.c:78:60: warning: incorrect type
in argument 3 (different signedness)
drivers/staging/rtl8188eu//core/rtw_ap.c:78:60:    expected int *len
drivers/staging/rtl8188eu//core/rtw_ap.c:78:60:    got unsigned int
*<noident>

Signed-off-by: default avatarAishwarya Pant <aishpant@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9c7dd5d

drivers/staging/rtl8188eu/core/rtw_ap.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	u8 val8, cur_channel, cur_bwmode, cur_ch_offset;

	u16 bcn_interval;

	u32	acparm;

	int	ie_len;

	uint	ie_len;

	struct registry_priv	 *pregpriv = &padapter->registrypriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct security_priv *psecuritypriv = &padapter->securitypriv;

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+5 −5
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ u8 *rtw_set_ie 
/*----------------------------------------------------------------------------

index: the information element id index, limit is the limit for search

-----------------------------------------------------------------------------*/

u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit)

u8 *rtw_get_ie(u8 *pbuf, int index, uint *len, int limit)

{

	int tmp, i;

	u8 *p;
@@ -293,7 +293,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 


unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)

{

	int len;

	uint len;

	u16 val16;

	__le16 le_tmp;

	unsigned char wpa_oui_type[] = {0x00, 0x50, 0xf2, 0x01};
@@ -331,7 +331,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit) 
	return NULL;

}



unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit)

unsigned char *rtw_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len, int limit)

{



	return rtw_get_ie(pie, _WPA2_IE_ID_, rsn_ie_len, limit);
@@ -1000,7 +1000,7 @@ int ieee80211_get_hdrlen(u16 fc) 


static int rtw_get_cipher_info(struct wlan_network *pnetwork)

{

	int wpa_ielen;

	uint wpa_ielen;

	unsigned char *pbuf;

	int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;

	int ret = _FAIL;
@@ -1045,7 +1045,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
	__le16 le_tmp;

	u16 wpa_len = 0, rsn_len = 0;

	struct HT_info_element *pht_info = NULL;

	int len;

	uint len;

	unsigned char		*p;



	memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.IEs), 2);

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+7 −7
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, 
static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)

{

	u8 *ssid_ie;

	int ssid_len_ori;

	uint ssid_len_ori;

	int len_diff = 0;



	ssid_ie = rtw_get_ie(ies,  WLAN_EID_SSID, &ssid_len_ori, ies_len);
@@ -1786,7 +1786,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 
		plist = phead->next;



		while (phead != plist) {

			int len;

			uint len;

			u8 *p;

			struct wlan_bssid_ex *pbss_network;
@@ -2556,7 +2556,7 @@ static unsigned int OnProbeReq(struct adapter *padapter, 
	    !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE))

		return _SUCCESS;



	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen,

	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, &ielen,

			len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);



	/* check (wildcard) SSID */
@@ -2793,7 +2793,7 @@ static unsigned int OnAuth(struct adapter *padapter, 
			/* checking for challenging txt... */

			DBG_88E("checking for challenging txt...\n");



			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&ie_len,

			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, &ie_len,

					len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);



			if ((p == NULL) || (ie_len <= 0)) {
@@ -2887,7 +2887,7 @@ static unsigned int OnAuthClient(struct adapter *padapter, 
	if (seq == 2) {

		if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {

			/*  legendary shared system */

			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&len,

			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, &len,

				pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);



			if (p == NULL)
@@ -2931,7 +2931,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, 
	struct sta_info	*pstat;

	unsigned char		reassoc, *p, *pos, *wpa_ie;

	unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};

	int		i, ie_len, wpa_ie_len, left;

	int		i, wpa_ie_len, left;

	unsigned char		supportRate[16];

	int					supportRateNum;

	unsigned short		status = _STATS_SUCCESSFUL_;
@@ -2943,7 +2943,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, 
	struct wlan_bssid_ex *cur = &(pmlmeinfo->network);

	struct sta_priv *pstapriv = &padapter->stapriv;

	u8 *pframe = precv_frame->pkt->data;

	uint pkt_len = precv_frame->pkt->len;

	uint ie_len, pkt_len = precv_frame->pkt->len;



	if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)

		return _FAIL;

drivers/staging/rtl8188eu/core/rtw_xmit.c

+1 −2
Original line number Diff line number Diff line
@@ -1139,9 +1139,8 @@ s32 rtw_put_snap(u8 *data, u16 h_proto) 


void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)

{

	uint	protection;

	uint	protection, erp_len;

	u8	*perp;

	int	 erp_len;

	struct	xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct	registry_priv *pregistrypriv = &padapter->registrypriv;

drivers/staging/rtl8188eu/include/ieee80211.h

+2 −2
Original line number Diff line number Diff line
@@ -857,12 +857,12 @@ enum secondary_ch_offset { 
	SCB = 3,  /* secondary channel below */

};



u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit);

u8 *rtw_get_ie(u8 *pbuf, int index, uint *len, int limit);



void rtw_set_supported_rate(u8 *SupportedRates, uint mode);



unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit);

unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit);

unsigned char *rtw_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len, int limit);

int rtw_get_wpa_cipher_suite(u8 *s);

int rtw_get_wpa2_cipher_suite(u8 *s);

int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len);