|
@@ -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)
|
|
static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
|
|
{
|
|
{
|
|
u8 *ssid_ie;
|
|
u8 *ssid_ie;
|
|
- int ssid_len_ori;
|
|
|
|
|
|
+ uint ssid_len_ori;
|
|
int len_diff = 0;
|
|
int len_diff = 0;
|
|
|
|
|
|
ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len);
|
|
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;
|
|
plist = phead->next;
|
|
|
|
|
|
while (phead != plist) {
|
|
while (phead != plist) {
|
|
- int len;
|
|
|
|
|
|
+ uint len;
|
|
u8 *p;
|
|
u8 *p;
|
|
struct wlan_bssid_ex *pbss_network;
|
|
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))
|
|
!check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE))
|
|
return _SUCCESS;
|
|
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_);
|
|
len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
|
|
|
|
|
|
/* check (wildcard) SSID */
|
|
/* check (wildcard) SSID */
|
|
@@ -2793,7 +2793,7 @@ static unsigned int OnAuth(struct adapter *padapter,
|
|
/* checking for challenging txt... */
|
|
/* checking for challenging txt... */
|
|
DBG_88E("checking for challenging txt...\n");
|
|
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);
|
|
len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
|
|
|
|
|
|
if ((p == NULL) || (ie_len <= 0)) {
|
|
if ((p == NULL) || (ie_len <= 0)) {
|
|
@@ -2887,7 +2887,7 @@ static unsigned int OnAuthClient(struct adapter *padapter,
|
|
if (seq == 2) {
|
|
if (seq == 2) {
|
|
if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {
|
|
if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {
|
|
/* legendary shared system */
|
|
/* 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_);
|
|
pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
|
|
|
|
|
|
if (p == NULL)
|
|
if (p == NULL)
|
|
@@ -2931,7 +2931,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
struct sta_info *pstat;
|
|
struct sta_info *pstat;
|
|
unsigned char reassoc, *p, *pos, *wpa_ie;
|
|
unsigned char reassoc, *p, *pos, *wpa_ie;
|
|
unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};
|
|
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];
|
|
unsigned char supportRate[16];
|
|
int supportRateNum;
|
|
int supportRateNum;
|
|
unsigned short status = _STATS_SUCCESSFUL_;
|
|
unsigned short status = _STATS_SUCCESSFUL_;
|
|
@@ -2943,7 +2943,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
struct wlan_bssid_ex *cur = &(pmlmeinfo->network);
|
|
struct wlan_bssid_ex *cur = &(pmlmeinfo->network);
|
|
struct sta_priv *pstapriv = &padapter->stapriv;
|
|
struct sta_priv *pstapriv = &padapter->stapriv;
|
|
u8 *pframe = precv_frame->pkt->data;
|
|
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)
|
|
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
|
|
return _FAIL;
|
|
return _FAIL;
|