|
@@ -669,10 +669,10 @@ static int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pss
|
|
|
get_rate_set(padapter, bssrate, &bssrate_len);
|
|
|
|
|
|
if (bssrate_len > 8) {
|
|
|
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));
|
|
|
- pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, bssrate, &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
|
|
|
} else {
|
|
|
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen));
|
|
|
}
|
|
|
|
|
|
/* add wps_ie for wps2.0 */
|
|
@@ -1001,7 +1001,7 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,
|
|
|
}
|
|
|
|
|
|
if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)
|
|
|
- pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6, REALTEK_96B_IE, &(pattrib->pktlen));
|
|
|
|
|
|
/* add WPS IE ie for wps 2.0 */
|
|
|
if (pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len > 0) {
|
|
@@ -1122,10 +1122,10 @@ static void issue_assocreq(struct adapter *padapter)
|
|
|
|
|
|
|
|
|
if (bssrate_len > 8) {
|
|
|
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));
|
|
|
- pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, bssrate, &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
|
|
|
} else {
|
|
|
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen));
|
|
|
}
|
|
|
|
|
|
/* RSN */
|
|
@@ -1167,7 +1167,7 @@ static void issue_assocreq(struct adapter *padapter)
|
|
|
memcpy(&pmlmeinfo->HT_caps.mcs, MCS_rate_2R, 16);
|
|
|
break;
|
|
|
}
|
|
|
- pframe = rtw_set_ie(pframe, _HT_CAPABILITY_IE_, ie_len , (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1196,7 +1196,7 @@ static void issue_assocreq(struct adapter *padapter)
|
|
|
}
|
|
|
|
|
|
if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)
|
|
|
- pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen));
|
|
|
+ pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6, REALTEK_96B_IE, &(pattrib->pktlen));
|
|
|
|
|
|
pattrib->last_txcmdsz = pattrib->pktlen;
|
|
|
dump_mgntframe(padapter, pmgntframe);
|
|
@@ -2646,7 +2646,7 @@ static unsigned int OnBeacon(struct adapter *padapter,
|
|
|
ret = rtw_check_bcn_info(padapter, pframe, len);
|
|
|
if (!ret) {
|
|
|
DBG_88E_LEVEL(_drv_info_, "ap has changed, disconnect now\n ");
|
|
|
- receive_disconnect(padapter, pmlmeinfo->network.MacAddress , 65535);
|
|
|
+ receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 65535);
|
|
|
return _SUCCESS;
|
|
|
}
|
|
|
/* update WMM, ERP in the beacon */
|
|
@@ -2804,7 +2804,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_, (int *)&ie_len,
|
|
|
len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
|
|
|
|
|
|
if ((p == NULL) || (ie_len <= 0)) {
|
|
@@ -3048,7 +3048,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
|
memcpy(supportRate, p+2, ie_len);
|
|
|
supportRateNum = ie_len;
|
|
|
|
|
|
- p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_ , &ie_len,
|
|
|
+ p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_, &ie_len,
|
|
|
pkt_len - WLAN_HDR_A3_LEN - ie_offset);
|
|
|
if (p != NULL) {
|
|
|
if (supportRateNum <= sizeof(supportRate)) {
|
|
@@ -3148,7 +3148,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
|
if (pmlmepriv->wps_beacon_ie) {
|
|
|
u8 selected_registrar = 0;
|
|
|
|
|
|
- rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR , &selected_registrar, NULL);
|
|
|
+ rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR, &selected_registrar, NULL);
|
|
|
|
|
|
if (!selected_registrar) {
|
|
|
DBG_88E("selected_registrar is false , or AP is not ready to do WPS\n");
|
|
@@ -3513,7 +3513,7 @@ static unsigned int OnDeAuth(struct adapter *padapter,
|
|
|
DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM\n",
|
|
|
reason, GetAddr3Ptr(pframe));
|
|
|
|
|
|
- receive_disconnect(padapter, GetAddr3Ptr(pframe) , reason);
|
|
|
+ receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
|
|
|
}
|
|
|
pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
|
|
|
return _SUCCESS;
|