Commit 7de2258b authored by Santha Meena Ramamoorthy's avatar Santha Meena Ramamoorthy Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: replace NULL comparison with variable 



Replace NULL comparison of the variable with the variable name or
!variable to conform to the Linux kernel coding style. Issue found using
checkpatch.

Signed-off-by: default avatarSantha Meena Ramamoorthy <santhameena13@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c41cd503

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+2 −2
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) 
	u8 match = false;

	u8 eid, wps_oui[4] = {0x0, 0x50, 0xf2, 0x04};



	if (ie_ptr == NULL)

	if (!ie_ptr)

		return match;



	eid = ie_ptr[0];
@@ -926,7 +926,7 @@ void rtw_macaddr_cfg(u8 *mac_addr) 
{

	u8 mac[ETH_ALEN];



	if (mac_addr == NULL)

	if (!mac_addr)

		return;



	if (rtw_initmac && mac_pton(rtw_initmac, mac)) {

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s 


	RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n", get_fwstate(pmlmepriv)));



	if (padapter == NULL) {

	if (!padapter) {

		res = false;

		goto exit;

	}

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+25 −25
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/rtl8188eu/core/rtw_recv.c

+10 −10
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static int recvframe_chkmic(struct adapter *adapter, 
			  prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5]));



		/* calculate mic code */

		if (stainfo != NULL) {

		if (stainfo) {

			if (IS_MCAST(prxattrib->ra)) {

				if (!psecuritypriv) {

					res = _FAIL;
@@ -1012,7 +1012,7 @@ static int validate_recv_mgnt_frame(struct adapter *padapter, 
	RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("+validate_recv_mgnt_frame\n"));



	precv_frame = recvframe_chk_defrag(padapter, precv_frame);

	if (precv_frame == NULL) {

	if (!precv_frame) {

		RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,

			 ("%s: fragment packet\n", __func__));

		return _SUCCESS;
@@ -1060,7 +1060,7 @@ static int validate_recv_data_frame(struct adapter *adapter, 
	psa = get_sa(ptr);

	pbssid = get_hdr_bssid(ptr);



	if (pbssid == NULL) {

	if (!pbssid) {

		ret = _FAIL;

		goto exit;

	}
@@ -1102,7 +1102,7 @@ static int validate_recv_data_frame(struct adapter *adapter, 
	else if (ret == RTW_RX_HANDLED)

		goto exit;



	if (psta == NULL) {

	if (!psta) {

		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" after to_fr_ds_chk; psta==NULL\n"));

		ret = _FAIL;

		goto exit;
@@ -1436,7 +1436,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter, 


	psta_addr = pfhdr->attrib.ta;

	psta = rtw_get_stainfo(pstapriv, psta_addr);

	if (psta == NULL) {

	if (!psta) {

		u8 type = GetFrameType(pfhdr->pkt->data);



		if (type != WIFI_DATA_TYPE) {
@@ -1455,7 +1455,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter, 
	if (ismfrag == 1) {

		/* 0~(n-1) fragment frame */

		/* enqueue to defraf_g */

		if (pdefrag_q != NULL) {

		if (pdefrag_q) {

			if (fragnum == 0) {

				/* the first fragment */

				if (!list_empty(&pdefrag_q->queue))
@@ -1482,7 +1482,7 @@ struct recv_frame *recvframe_chk_defrag(struct adapter *padapter, 
	if ((ismfrag == 0) && (fragnum != 0)) {

		/* the last fragment frame */

		/* enqueue the last fragment */

		if (pdefrag_q != NULL) {

		if (pdefrag_q) {

			phead = get_list_head(pdefrag_q);

			list_add_tail(&pfhdr->list, phead);
@@ -1928,20 +1928,20 @@ static int recv_func_posthandle(struct adapter *padapter, 
	LedControl8188eu(padapter, LED_CTL_RX);



	prframe = decryptor(padapter, prframe);

	if (prframe == NULL) {

	if (!prframe) {

		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decryptor: drop pkt\n"));

		ret = _FAIL;

		goto _recv_data_drop;

	}



	prframe = recvframe_chk_defrag(padapter, prframe);

	if (prframe == NULL) {

	if (!prframe) {

		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chk_defrag: drop pkt\n"));

		goto _recv_data_drop;

	}



	prframe = portctrl(padapter, prframe);

	if (prframe == NULL) {

	if (!prframe) {

		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("portctrl: drop pkt\n"));

		ret = _FAIL;

		goto _recv_data_drop;

drivers/staging/rtl8188eu/core/rtw_security.c

+2 −2
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) 
	/* 4 start to decrypt recvframe */

	if (prxattrib->encrypt == _TKIP_) {

		stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);

		if (stainfo != NULL) {

		if (stainfo) {

			if (IS_MCAST(prxattrib->ra)) {

				if (!psecuritypriv->binstallGrpkey) {

					res = _FAIL;
@@ -1245,7 +1245,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) 
		else

			stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);



		if (stainfo != NULL) {

		if (stainfo) {

			RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo!= NULL!!!\n"));



			if (IS_MCAST(pattrib->ra))