Commit cd1f1450 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: clean up comparsions to NULL 



Clean up comparsions to NULL reported by checkpatch.

x == NULL -> !x
x != NULL -> x

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210829154533.11054-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 147dbb19

drivers/staging/rtl8723bs/core/rtw_ap.c

+10 −10
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
		&ie_len,

		(pbss_network->ie_length - _BEACON_IE_OFFSET_)

	);

	if (p !=  NULL) {

	if (p) {

		memcpy(supportRate, p + 2, ie_len);

		supportRateNum = ie_len;

	}
@@ -904,7 +904,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
		&ie_len,

		pbss_network->ie_length - _BEACON_IE_OFFSET_

	);

	if (p !=  NULL) {

	if (p) {

		memcpy(supportRate + supportRateNum, p + 2, ie_len);

		supportRateNum += ie_len;

	}
@@ -992,7 +992,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
			break;

		}



		if ((p == NULL) || (ie_len == 0))

		if (!p || ie_len == 0)

			break;

	}
@@ -1022,7 +1022,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
				break;

			}



			if ((p == NULL) || (ie_len == 0))

			if (!p || ie_len == 0)

				break;

		}

	}
@@ -1146,7 +1146,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->mac_address);

	if (!psta) {

		psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->mac_address);

		if (psta == NULL)

		if (!psta)

			return _FAIL;

	}
@@ -1276,7 +1276,7 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta) 
	}



	psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));

	if (psetstakey_para == NULL) {

	if (!psetstakey_para) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1312,12 +1312,12 @@ static int rtw_ap_set_key( 
	int res = _SUCCESS;



	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

	if (!pcmd) {

		res = _FAIL;

		goto exit;

	}

	psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));

	if (psetkeyparm == NULL) {

	if (!psetkeyparm) {

		kfree(pcmd);

		res = _FAIL;

		goto exit;
@@ -1475,11 +1475,11 @@ static void update_bcn_wps_ie(struct adapter *padapter) 
		&wps_ielen

	);



	if (pwps_ie == NULL || wps_ielen == 0)

	if (!pwps_ie || wps_ielen == 0)

		return;



	pwps_ie_src = pmlmepriv->wps_beacon_ie;

	if (pwps_ie_src == NULL)

	if (!pwps_ie_src)

		return;



	wps_offset = (uint)(pwps_ie - ie);

drivers/staging/rtl8723bs/core/rtw_cmd.c

+48 −48
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) 
{

	unsigned long irqL;



	if (obj == NULL)

	if (!obj)

		goto exit;



	/* spin_lock_bh(&queue->lock); */
@@ -324,7 +324,7 @@ int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) 
	int res = _FAIL;

	struct adapter *padapter = pcmdpriv->padapter;



	if (cmd_obj == NULL)

	if (!cmd_obj)

		goto exit;



	cmd_obj->padapter = padapter;
@@ -489,7 +489,7 @@ int rtw_cmd_thread(void *context) 
		/* call callback function for post-processed */

		if (pcmd->cmdcode < ARRAY_SIZE(rtw_cmd_callback)) {

			pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback;

			if (pcmd_callback == NULL) {

			if (!pcmd_callback) {

				rtw_free_cmd_obj(pcmd);

			} else {

				/* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!= NULL) */
@@ -508,7 +508,7 @@ int rtw_cmd_thread(void *context) 
	/*  free all cmd_obj resources */

	do {

		pcmd = rtw_dequeue_cmd(pcmdpriv);

		if (pcmd == NULL) {

		if (!pcmd) {

			rtw_unregister_cmd_alive(padapter);

			break;

		}
@@ -547,11 +547,11 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 
		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL)

	if (!ph2c)

		return _FAIL;



	psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));

	if (psurveyPara == NULL) {

	if (!psurveyPara) {

		kfree(ph2c);

		return _FAIL;

	}
@@ -609,13 +609,13 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pbsetdataratepara = rtw_zmalloc(sizeof(struct setdatarate_parm));

	if (pbsetdataratepara == NULL) {

	if (!pbsetdataratepara) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -645,7 +645,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

	if (!pcmd) {

		res = _FAIL;

		goto exit;

	}
@@ -678,7 +678,7 @@ int rtw_startbss_cmd(struct adapter *padapter, int flags) 
	} else {

		/* need enqueue, prepare cmd_obj and enqueue */

		pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

		if (pcmd == NULL) {

		if (!pcmd) {

			res = _FAIL;

			goto exit;

		}
@@ -730,7 +730,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	u8 *ptmp = NULL;



	pcmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd == NULL) {

	if (!pcmd) {

		res = _FAIL;

		goto exit;

	}
@@ -842,7 +842,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu 


	/* prepare cmd parameter */

	param = rtw_zmalloc(sizeof(*param));

	if (param == NULL) {

	if (!param) {

		res = _FAIL;

		goto exit;

	}
@@ -851,7 +851,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu 
	if (enqueue) {

		/* need enqueue, prepare cmd_obj and enqueue */

		cmdobj = rtw_zmalloc(sizeof(*cmdobj));

		if (cmdobj == NULL) {

		if (!cmdobj) {

			res = _FAIL;

			kfree(param);

			goto exit;
@@ -879,7 +879,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infrast 


	psetop = rtw_zmalloc(sizeof(struct setopmode_parm));



	if (psetop == NULL) {

	if (!psetop) {

		res = _FAIL;

		goto exit;

	}
@@ -887,7 +887,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infrast 


	if (enqueue) {

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

		if (!ph2c) {

			kfree(psetop);

			res = _FAIL;

			goto exit;
@@ -915,7 +915,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ 
	u8 res = _SUCCESS;



	psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));

	if (psetstakey_para == NULL) {

	if (!psetstakey_para) {

		res = _FAIL;

		goto exit;

	}
@@ -937,14 +937,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_ 


	if (enqueue) {

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

		if (!ph2c) {

			kfree(psetstakey_para);

			res = _FAIL;

			goto exit;

		}



		psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));

		if (psetstakey_rsp == NULL) {

		if (!psetstakey_rsp) {

			kfree(ph2c);

			kfree(psetstakey_para);

			res = _FAIL;
@@ -982,20 +982,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu 
		}

	} else {

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

		if (!ph2c) {

			res = _FAIL;

			goto exit;

		}



		psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));

		if (psetstakey_para == NULL) {

		if (!psetstakey_para) {

			kfree(ph2c);

			res = _FAIL;

			goto exit;

		}



		psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));

		if (psetstakey_rsp == NULL) {

		if (!psetstakey_rsp) {

			kfree(ph2c);

			kfree(psetstakey_para);

			res = _FAIL;
@@ -1027,13 +1027,13 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	paddbareq_parm = rtw_zmalloc(sizeof(struct addBaReq_parm));

	if (paddbareq_parm == NULL) {

	if (!paddbareq_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1059,13 +1059,13 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1094,13 +1094,13 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1130,13 +1130,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) 


	/* only  primary padapter does this cmd */

	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1178,7 +1178,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf 


	/* prepare cmd parameter */

	setChannelPlan_param = rtw_zmalloc(sizeof(struct SetChannelPlan_param));

	if (setChannelPlan_param == NULL) {

	if (!setChannelPlan_param) {

		res = _FAIL;

		goto exit;

	}
@@ -1187,7 +1187,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf 
	if (enqueue) {

		/* need enqueue, prepare cmd_obj and enqueue */

		pcmdobj = rtw_zmalloc(sizeof(struct cmd_obj));

		if (pcmdobj == NULL) {

		if (!pcmdobj) {

			kfree(setChannelPlan_param);

			res = _FAIL;

			goto exit;
@@ -1437,13 +1437,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) 


	if (enqueue) {

		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

		if (!ph2c) {

			res = _FAIL;

			goto exit;

		}



		pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

		if (pdrvextra_cmd_parm == NULL) {

		if (!pdrvextra_cmd_parm) {

			kfree(ph2c);

			res = _FAIL;

			goto exit;
@@ -1479,13 +1479,13 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter) 




	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1545,13 +1545,13 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta) 




	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1580,13 +1580,13 @@ u8 rtw_ps_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	ppscmd = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ppscmd == NULL) {

	if (!ppscmd) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ppscmd);

		res = _FAIL;

		goto exit;
@@ -1652,13 +1652,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1746,13 +1746,13 @@ u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1781,13 +1781,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));

	if (pdrvextra_cmd_parm == NULL) {

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -1962,7 +1962,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;

	struct wlan_network *tgt_network = &(pmlmepriv->cur_network);



	if (pcmd->parmbuf == NULL)

	if (!pcmd->parmbuf)

		goto exit;



	if (pcmd->res != H2C_SUCCESS)
@@ -1985,9 +1985,9 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
	} else {

		pwlan = rtw_alloc_network(pmlmepriv);

		spin_lock_bh(&(pmlmepriv->scanned_queue.lock));

		if (pwlan == NULL) {

		if (!pwlan) {

			pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);

			if (pwlan == NULL) {

			if (!pwlan) {

				spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));

				goto createbss_cmd_fail;

			}

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s 
	struct	mlme_priv 	*pmlmepriv = &padapter->mlmepriv;

	u8 res = true;



	if (padapter == NULL) {

	if (!padapter) {

		res = false;

		goto exit;

	}
@@ -481,7 +481,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
		return 0;



	psta = rtw_get_stainfo(&adapter->stapriv, get_bssid(pmlmepriv));

	if (psta == NULL)

	if (!psta)

		return 0;



	short_GI = query_ra_short_GI(psta);

drivers/staging/rtl8723bs/core/rtw_mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) 
		pwlan = list_entry(plist, struct wlan_network, list);



		if (!pwlan->fixed) {

			if (oldest == NULL || time_after(oldest->last_scanned, pwlan->last_scanned))

			if (!oldest || time_after(oldest->last_scanned, pwlan->last_scanned))

				oldest = pwlan;

		}

	}
@@ -544,7 +544,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
			/* TODO: don't select network in the same ess as oldest if it's new enough*/

		}



		if (oldest == NULL || time_after(oldest->last_scanned, pnetwork->last_scanned))

		if (!oldest || time_after(oldest->last_scanned, pnetwork->last_scanned))

			oldest = pnetwork;



	}
@@ -1822,7 +1822,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme 
			goto exit;

	}



	if (*candidate == NULL || (*candidate)->network.rssi < competitor->network.rssi) {

	if (!*candidate || (*candidate)->network.rssi < competitor->network.rssi) {

		*candidate = competitor;

		updated = true;

	}

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+28 −28
Original line number Diff line number Diff line
@@ -742,11 +742,11 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) 
	}



	pstat = rtw_get_stainfo(pstapriv, sa);

	if (pstat == NULL) {

	if (!pstat) {



		/*  allocate a new one */

		pstat = rtw_alloc_stainfo(pstapriv, sa);

		if (pstat == NULL) {

		if (!pstat) {

			status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;

			goto auth_fail;

		}
@@ -814,7 +814,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) 
			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, WLAN_EID_CHALLENGE, (int *)&ie_len,

					len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);



			if ((p == NULL) || (ie_len <= 0)) {

			if (!p || ie_len <= 0) {

				status = WLAN_STATUS_CHALLENGE_FAIL;

				goto auth_fail;

			}
@@ -1034,7 +1034,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 


	/*  check if the supported rate is ok */

	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_SUPP_RATES, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset);

	if (p == NULL) {

	if (!p) {

		/*  use our own rate set as statoin used */

		/* memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); */

		/* supportRateNum = AP_BSSRATE_LEN; */
@@ -1047,7 +1047,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 


		p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_EXT_SUPP_RATES, &ie_len,

				pkt_len - WLAN_HDR_A3_LEN - ie_offset);

		if (p !=  NULL) {

		if (p) {



			if (supportRateNum <= sizeof(supportRate)) {

				memcpy(supportRate+supportRateNum, p+2, ie_len);
@@ -1294,7 +1294,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 
	/* get a unique AID */

	if (pstat->aid == 0) {

		for (pstat->aid = 1; pstat->aid <= NUM_STA; pstat->aid++)

			if (pstapriv->sta_aid[pstat->aid - 1] == NULL)

			if (!pstapriv->sta_aid[pstat->aid - 1])

				break;



		/* if (pstat->aid > NUM_STA) { */
@@ -1944,7 +1944,7 @@ static struct xmit_frame *_alloc_mgtxmitframe(struct xmit_priv *pxmitpriv, bool 
		goto exit;



	pxmitbuf = rtw_alloc_xmitbuf_ext(pxmitpriv);

	if (pxmitbuf == NULL) {

	if (!pxmitbuf) {

		rtw_free_xmitframe(pxmitpriv, pmgntframe);

		pmgntframe = NULL;

		goto exit;
@@ -2297,7 +2297,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
	struct wlan_bssid_ex		*cur_network = &(pmlmeinfo->network);

	unsigned int	rate_len;



	if (da == NULL)

	if (!da)

		return;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);
@@ -2621,7 +2621,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 
	__le16 le_tmp;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL)

	if (!pmgntframe)

		return;



	/* update attribute */
@@ -2752,7 +2752,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
	__le16 lestatus, le_tmp;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL)

	if (!pmgntframe)

		return;



	/* update attribute */
@@ -2840,7 +2840,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
				break;

			}



			if ((pbuf == NULL) || (ie_len == 0)) {

			if (!pbuf || ie_len == 0) {

				break;

			}

		}
@@ -2884,7 +2884,7 @@ void issue_assocreq(struct adapter *padapter) 
	u8 vs_ie_length = 0;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL)

	if (!pmgntframe)

		goto exit;



	/* update attribute */
@@ -3061,7 +3061,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, 
	pmlmeinfo = &(pmlmeext->mlmext_info);



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL)

	if (!pmgntframe)

		goto exit;



	/* update attribute */
@@ -3200,7 +3200,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, 
	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL)

	if (!pmgntframe)

		goto exit;



	/* update attribute */
@@ -3313,7 +3313,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, 
	__le16 le_tmp;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL) {

	if (!pmgntframe) {

		goto exit;

	}
@@ -3639,7 +3639,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 
	action = ACT_PUBLIC_BSSCOEXIST;



	pmgntframe = alloc_mgtxmitframe(pxmitpriv);

	if (pmgntframe == NULL) {

	if (!pmgntframe) {

		return;

	}
@@ -3706,7 +3706,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 
			pbss_network = (struct wlan_bssid_ex *)&pnetwork->network;



			p = rtw_get_ie(pbss_network->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pbss_network->ie_length - _FIXED_IE_LENGTH_);

			if ((p == NULL) || (len == 0)) {/* non-HT */

			if (!p || len == 0) {/* non-HT */



				if (pbss_network->configuration.ds_config <= 0)

					continue;
@@ -3769,7 +3769,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) 
			return _SUCCESS;



	psta = rtw_get_stainfo(pstapriv, addr);

	if (psta == NULL)

	if (!psta)

		return _SUCCESS;



	if (initiator == 0) {/*  recipient */
@@ -4641,13 +4641,13 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL) {

	if (!pcmd_obj) {

		return;

	}



	cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

	if (!pevtcmd) {

		kfree(pcmd_obj);

		return;

	}
@@ -4693,12 +4693,12 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int 
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;



	pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));

	if (pcmd_obj == NULL)

	if (!pcmd_obj)

		return;



	cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));

	pevtcmd = rtw_zmalloc(cmdsz);

	if (pevtcmd == NULL) {

	if (!pevtcmd) {

		kfree(pcmd_obj);

		return;

	}
@@ -5147,12 +5147,12 @@ void survey_timer_hdl(struct timer_list *t) 
		}



		ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

		if (ph2c == NULL) {

		if (!ph2c) {

			goto exit_survey_timer_hdl;

		}



		psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));

		if (psurveyPara == NULL) {

		if (!psurveyPara) {

			kfree(ph2c);

			goto exit_survey_timer_hdl;

		}
@@ -5781,7 +5781,7 @@ u8 chk_bmc_sleepq_cmd(struct adapter *padapter) 
	u8 res = _SUCCESS;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}
@@ -5805,13 +5805,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) 
	int len_diff = 0;



	ph2c = rtw_zmalloc(sizeof(struct cmd_obj));

	if (ph2c == NULL) {

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param));

	if (ptxBeacon_parm == NULL) {

	if (!ptxBeacon_parm) {

		kfree(ph2c);

		res = _FAIL;

		goto exit;
@@ -5871,7 +5871,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf) 
	void (*event_callback)(struct adapter *dev, u8 *pbuf);

	struct evt_priv *pevt_priv = &(padapter->evtpriv);



	if (pbuf == NULL)

	if (!pbuf)

		goto _abort_event_;



	peventbuf = (uint *)pbuf;