|
@@ -163,13 +163,13 @@ struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv)
|
|
|
struct xmit_buf *pxmitbuf;
|
|
|
|
|
|
pmgntframe = rtw_alloc_xmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL) {
|
|
|
+ if (!pmgntframe) {
|
|
|
DBG_88E("%s, alloc xmitframe fail\n", __func__);
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
pxmitbuf = rtw_alloc_xmitbuf_ext(pxmitpriv);
|
|
|
- if (pxmitbuf == NULL) {
|
|
|
+ if (!pxmitbuf) {
|
|
|
DBG_88E("%s, alloc xmitbuf fail\n", __func__);
|
|
|
rtw_free_xmitframe(pxmitpriv, pmgntframe);
|
|
|
return NULL;
|
|
@@ -332,7 +332,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)
|
|
|
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL) {
|
|
|
+ if (!pmgntframe) {
|
|
|
DBG_88E("%s, alloc mgnt frame fail\n", __func__);
|
|
|
return;
|
|
|
}
|
|
@@ -478,7 +478,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)
|
|
|
unsigned int rate_len;
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL) {
|
|
|
+ if (!pmgntframe) {
|
|
|
DBG_88E("%s, alloc mgnt frame fail\n", __func__);
|
|
|
return;
|
|
|
}
|
|
@@ -626,7 +626,7 @@ static int issue_probereq(struct adapter *padapter,
|
|
|
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+issue_probereq\n"));
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
goto exit;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -912,7 +912,7 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,
|
|
|
DBG_88E("%s\n", __func__);
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
return;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -1039,7 +1039,7 @@ static void issue_assocreq(struct adapter *padapter)
|
|
|
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
goto exit;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -1133,7 +1133,7 @@ static void issue_assocreq(struct adapter *padapter)
|
|
|
|
|
|
/* RSN */
|
|
|
p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(struct ndis_802_11_fixed_ie)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.IELength - sizeof(struct ndis_802_11_fixed_ie)));
|
|
|
- if (p != NULL)
|
|
|
+ if (p)
|
|
|
pframe = rtw_set_ie(pframe, _RSN_IE_2_, ie_len, (p + 2), &(pattrib->pktlen));
|
|
|
|
|
|
/* HT caps */
|
|
@@ -1221,7 +1221,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,
|
|
|
pnetwork = &(pmlmeinfo->network);
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
goto exit;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -1338,7 +1338,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
|
|
|
DBG_88E("%s\n", __func__);
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
goto exit;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -1584,7 +1584,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
|
|
|
DBG_88E("%s, category=%d, action=%d, status=%d\n", __func__, category, action, status);
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
return;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -1632,7 +1632,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
|
|
|
&pattrib->pktlen);
|
|
|
|
|
|
psta = rtw_get_stainfo(pstapriv, raddr);
|
|
|
- if (psta != NULL) {
|
|
|
+ if (psta) {
|
|
|
start_seq = (psta->sta_xmitpriv.txseq_tid[status & 0x07]&0xfff) + 1;
|
|
|
|
|
|
DBG_88E("BA_starting_seqctrl=%d for TID=%d\n", start_seq, status & 0x07);
|
|
@@ -1743,7 +1743,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
|
|
action = ACT_PUBLIC_BSSCOEXIST;
|
|
|
|
|
|
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
|
|
- if (pmgntframe == NULL)
|
|
|
+ if (!pmgntframe)
|
|
|
return;
|
|
|
|
|
|
/* update attribute */
|
|
@@ -2091,7 +2091,7 @@ static u8 collect_bss_info(struct adapter *padapter,
|
|
|
|
|
|
/* checking SSID */
|
|
|
p = rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset);
|
|
|
- if (p == NULL) {
|
|
|
+ if (!p) {
|
|
|
DBG_88E("marc: cannot find SSID for survey event\n");
|
|
|
return _FAIL;
|
|
|
}
|
|
@@ -2122,7 +2122,7 @@ static u8 collect_bss_info(struct adapter *padapter,
|
|
|
}
|
|
|
|
|
|
p = rtw_get_ie(bssid->IEs + ie_offset, _EXT_SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset);
|
|
|
- if (p != NULL) {
|
|
|
+ if (p) {
|
|
|
if (len > (NDIS_802_11_LENGTH_RATES_EX-i)) {
|
|
|
DBG_88E("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len);
|
|
|
return _FAIL;
|
|
@@ -2568,7 +2568,7 @@ static unsigned int OnProbeReq(struct adapter *padapter,
|
|
|
len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
|
|
|
|
|
|
/* check (wildcard) SSID */
|
|
|
- if (p != NULL) {
|
|
|
+ if (p) {
|
|
|
if ((ielen != 0 && memcmp((void *)(p+2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength)) ||
|
|
|
(ielen == 0 && pmlmeinfo->hidden_ssid_mode))
|
|
|
return _SUCCESS;
|
|
@@ -2735,11 +2735,11 @@ static unsigned int OnAuth(struct adapter *padapter,
|
|
|
}
|
|
|
|
|
|
pstat = rtw_get_stainfo(pstapriv, sa);
|
|
|
- if (pstat == NULL) {
|
|
|
+ if (!pstat) {
|
|
|
/* allocate a new one */
|
|
|
DBG_88E("going to alloc stainfo for sa=%pM\n", sa);
|
|
|
pstat = rtw_alloc_stainfo(pstapriv, sa);
|
|
|
- if (pstat == NULL) {
|
|
|
+ if (!pstat) {
|
|
|
DBG_88E(" Exceed the upper limit of supported clients...\n");
|
|
|
status = _STATS_UNABLE_HANDLE_STA_;
|
|
|
goto auth_fail;
|
|
@@ -2973,7 +2973,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
|
}
|
|
|
|
|
|
pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
|
|
|
- if (pstat == NULL) {
|
|
|
+ if (!pstat) {
|
|
|
status = _RSON_CLS2_;
|
|
|
goto asoc_class2_error;
|
|
|
}
|
|
@@ -3014,7 +3014,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
|
/* checking SSID */
|
|
|
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len,
|
|
|
pkt_len - WLAN_HDR_A3_LEN - ie_offset);
|
|
|
- if (p == NULL)
|
|
|
+ if (!p)
|
|
|
status = _STATS_FAILURE_;
|
|
|
|
|
|
if (ie_len == 0) { /* broadcast ssid, however it is not allowed in assocreq */
|
|
@@ -3122,7 +3122,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
|
|
goto OnAssocReqFail;
|
|
|
|
|
|
pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
|
|
|
- if (wpa_ie == NULL) {
|
|
|
+ if (!wpa_ie) {
|
|
|
if (elems.wps_ie) {
|
|
|
DBG_88E("STA included WPS IE in "
|
|
|
"(Re)Association Request - assume WPS is "
|
|
@@ -3653,7 +3653,7 @@ static unsigned int OnAction_back(struct adapter *padapter,
|
|
|
addr = GetAddr2Ptr(pframe);
|
|
|
psta = rtw_get_stainfo(pstapriv, addr);
|
|
|
|
|
|
- if (psta == NULL)
|
|
|
+ if (!psta)
|
|
|
return _SUCCESS;
|
|
|
|
|
|
frame_body = (unsigned char *)(pframe + sizeof(struct ieee80211_hdr_3addr));
|
|
@@ -4170,7 +4170,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
|
|
|
}
|
|
|
ptable += index;
|
|
|
|
|
|
- if (psta != NULL) {
|
|
|
+ if (psta) {
|
|
|
if (GetRetry(pframe)) {
|
|
|
if (precv_frame->attrib.seq_num ==
|
|
|
psta->RxMgmtFrameSeqNum) {
|
|
@@ -4702,7 +4702,7 @@ void linked_status_chk(struct adapter *padapter)
|
|
|
|
|
|
rx_chk_limit = 4;
|
|
|
psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress);
|
|
|
- if (psta != NULL) {
|
|
|
+ if (psta) {
|
|
|
bool is_p2p_enable = false;
|
|
|
|
|
|
if (!chk_ap_is_alive(padapter, psta))
|
|
@@ -4782,7 +4782,7 @@ void linked_status_chk(struct adapter *padapter)
|
|
|
if (pmlmeinfo->FW_sta_info[i].status == 1) {
|
|
|
psta = pmlmeinfo->FW_sta_info[i].psta;
|
|
|
|
|
|
- if (psta == NULL)
|
|
|
+ if (!psta)
|
|
|
continue;
|
|
|
if (pmlmeinfo->FW_sta_info[i].rx_pkt == sta_rx_pkts(psta)) {
|
|
|
if (pmlmeinfo->FW_sta_info[i].retry < 3) {
|