aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAishwarya Pant <aishpant@gmail.com>2017-04-15 08:37:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-18 07:54:25 -0400
commitaf27bea4627358815b773fa2c31dabad62457308 (patch)
treeeb73493889ea7df1cad24da768f19623ee3dd36b
parentd9c7dd5db1d0f6f212072625781dddbbe6e253d7 (diff)
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: Aishwarya Pant <aishpant@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8188eu/core/rtw_ap.c2
-rw-r--r--drivers/staging/rtl8188eu/core/rtw_ieee80211.c10
-rw-r--r--drivers/staging/rtl8188eu/core/rtw_mlme_ext.c14
-rw-r--r--drivers/staging/rtl8188eu/core/rtw_xmit.c3
-rw-r--r--drivers/staging/rtl8188eu/include/ieee80211.h4
5 files changed, 16 insertions, 17 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 3fa6af208b91..91156a21b8f2 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -719,7 +719,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
719 u8 val8, cur_channel, cur_bwmode, cur_ch_offset; 719 u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
720 u16 bcn_interval; 720 u16 bcn_interval;
721 u32 acparm; 721 u32 acparm;
722 int ie_len; 722 uint ie_len;
723 struct registry_priv *pregpriv = &padapter->registrypriv; 723 struct registry_priv *pregpriv = &padapter->registrypriv;
724 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 724 struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
725 struct security_priv *psecuritypriv = &padapter->securitypriv; 725 struct security_priv *psecuritypriv = &padapter->securitypriv;
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index d1cd34011602..f55b38f35ca3 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -158,7 +158,7 @@ u8 *rtw_set_ie
158/*---------------------------------------------------------------------------- 158/*----------------------------------------------------------------------------
159index: the information element id index, limit is the limit for search 159index: the information element id index, limit is the limit for search
160-----------------------------------------------------------------------------*/ 160-----------------------------------------------------------------------------*/
161u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit) 161u8 *rtw_get_ie(u8 *pbuf, int index, uint *len, int limit)
162{ 162{
163 int tmp, i; 163 int tmp, i;
164 u8 *p; 164 u8 *p;
@@ -293,7 +293,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
293 293
294unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit) 294unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)
295{ 295{
296 int len; 296 uint len;
297 u16 val16; 297 u16 val16;
298 __le16 le_tmp; 298 __le16 le_tmp;
299 unsigned char wpa_oui_type[] = {0x00, 0x50, 0xf2, 0x01}; 299 unsigned char wpa_oui_type[] = {0x00, 0x50, 0xf2, 0x01};
@@ -331,7 +331,7 @@ check_next_ie:
331 return NULL; 331 return NULL;
332} 332}
333 333
334unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit) 334unsigned char *rtw_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len, int limit)
335{ 335{
336 336
337 return rtw_get_ie(pie, _WPA2_IE_ID_, rsn_ie_len, limit); 337 return rtw_get_ie(pie, _WPA2_IE_ID_, rsn_ie_len, limit);
@@ -1000,7 +1000,7 @@ int ieee80211_get_hdrlen(u16 fc)
1000 1000
1001static int rtw_get_cipher_info(struct wlan_network *pnetwork) 1001static int rtw_get_cipher_info(struct wlan_network *pnetwork)
1002{ 1002{
1003 int wpa_ielen; 1003 uint wpa_ielen;
1004 unsigned char *pbuf; 1004 unsigned char *pbuf;
1005 int group_cipher = 0, pairwise_cipher = 0, is8021x = 0; 1005 int group_cipher = 0, pairwise_cipher = 0, is8021x = 0;
1006 int ret = _FAIL; 1006 int ret = _FAIL;
@@ -1045,7 +1045,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
1045 __le16 le_tmp; 1045 __le16 le_tmp;
1046 u16 wpa_len = 0, rsn_len = 0; 1046 u16 wpa_len = 0, rsn_len = 0;
1047 struct HT_info_element *pht_info = NULL; 1047 struct HT_info_element *pht_info = NULL;
1048 int len; 1048 uint len;
1049 unsigned char *p; 1049 unsigned char *p;
1050 1050
1051 memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.IEs), 2); 1051 memcpy(&le_tmp, rtw_get_capability_from_ie(pnetwork->network.IEs), 2);
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 30dd4edd1026..88a3a2b9c144 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -286,7 +286,7 @@ static s32 dump_mgntframe_and_wait_ack(struct adapter *padapter,
286static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) 286static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
287{ 287{
288 u8 *ssid_ie; 288 u8 *ssid_ie;
289 int ssid_len_ori; 289 uint ssid_len_ori;
290 int len_diff = 0; 290 int len_diff = 0;
291 291
292 ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len); 292 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)
1786 plist = phead->next; 1786 plist = phead->next;
1787 1787
1788 while (phead != plist) { 1788 while (phead != plist) {
1789 int len; 1789 uint len;
1790 u8 *p; 1790 u8 *p;
1791 struct wlan_bssid_ex *pbss_network; 1791 struct wlan_bssid_ex *pbss_network;
1792 1792
@@ -2556,7 +2556,7 @@ static unsigned int OnProbeReq(struct adapter *padapter,
2556 !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) 2556 !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE))
2557 return _SUCCESS; 2557 return _SUCCESS;
2558 2558
2559 p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen, 2559 p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, &ielen,
2560 len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); 2560 len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
2561 2561
2562 /* check (wildcard) SSID */ 2562 /* check (wildcard) SSID */
@@ -2793,7 +2793,7 @@ static unsigned int OnAuth(struct adapter *padapter,
2793 /* checking for challenging txt... */ 2793 /* checking for challenging txt... */
2794 DBG_88E("checking for challenging txt...\n"); 2794 DBG_88E("checking for challenging txt...\n");
2795 2795
2796 p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&ie_len, 2796 p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, &ie_len,
2797 len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4); 2797 len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
2798 2798
2799 if ((p == NULL) || (ie_len <= 0)) { 2799 if ((p == NULL) || (ie_len <= 0)) {
@@ -2887,7 +2887,7 @@ static unsigned int OnAuthClient(struct adapter *padapter,
2887 if (seq == 2) { 2887 if (seq == 2) {
2888 if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) { 2888 if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {
2889 /* legendary shared system */ 2889 /* legendary shared system */
2890 p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&len, 2890 p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, &len,
2891 pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_); 2891 pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
2892 2892
2893 if (p == NULL) 2893 if (p == NULL)
@@ -2931,7 +2931,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
2931 struct sta_info *pstat; 2931 struct sta_info *pstat;
2932 unsigned char reassoc, *p, *pos, *wpa_ie; 2932 unsigned char reassoc, *p, *pos, *wpa_ie;
2933 unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01}; 2933 unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};
2934 int i, ie_len, wpa_ie_len, left; 2934 int i, wpa_ie_len, left;
2935 unsigned char supportRate[16]; 2935 unsigned char supportRate[16];
2936 int supportRateNum; 2936 int supportRateNum;
2937 unsigned short status = _STATS_SUCCESSFUL_; 2937 unsigned short status = _STATS_SUCCESSFUL_;
@@ -2943,7 +2943,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
2943 struct wlan_bssid_ex *cur = &(pmlmeinfo->network); 2943 struct wlan_bssid_ex *cur = &(pmlmeinfo->network);
2944 struct sta_priv *pstapriv = &padapter->stapriv; 2944 struct sta_priv *pstapriv = &padapter->stapriv;
2945 u8 *pframe = precv_frame->pkt->data; 2945 u8 *pframe = precv_frame->pkt->data;
2946 uint pkt_len = precv_frame->pkt->len; 2946 uint ie_len, pkt_len = precv_frame->pkt->len;
2947 2947
2948 if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) 2948 if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
2949 return _FAIL; 2949 return _FAIL;
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index 1470a2eb506d..be2f46eb9f78 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -1139,9 +1139,8 @@ s32 rtw_put_snap(u8 *data, u16 h_proto)
1139 1139
1140void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len) 1140void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
1141{ 1141{
1142 uint protection; 1142 uint protection, erp_len;
1143 u8 *perp; 1143 u8 *perp;
1144 int erp_len;
1145 struct xmit_priv *pxmitpriv = &padapter->xmitpriv; 1144 struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
1146 struct registry_priv *pregistrypriv = &padapter->registrypriv; 1145 struct registry_priv *pregistrypriv = &padapter->registrypriv;
1147 1146
diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index fc58621368c1..b3f331aa381e 100644
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -857,12 +857,12 @@ enum secondary_ch_offset {
857 SCB = 3, /* secondary channel below */ 857 SCB = 3, /* secondary channel below */
858}; 858};
859 859
860u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit); 860u8 *rtw_get_ie(u8 *pbuf, int index, uint *len, int limit);
861 861
862void rtw_set_supported_rate(u8 *SupportedRates, uint mode); 862void rtw_set_supported_rate(u8 *SupportedRates, uint mode);
863 863
864unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit); 864unsigned char *rtw_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit);
865unsigned char *rtw_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit); 865unsigned char *rtw_get_wpa2_ie(unsigned char *pie, uint *rsn_ie_len, int limit);
866int rtw_get_wpa_cipher_suite(u8 *s); 866int rtw_get_wpa_cipher_suite(u8 *s);
867int rtw_get_wpa2_cipher_suite(u8 *s); 867int rtw_get_wpa2_cipher_suite(u8 *s);
868int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len); 868int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len);