staging: rtl8723bs: core: Replace NULL comparisons. (41452327) · Commits · 戴 / test

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -381,7 +381,7 @@ static void init_channel_list(struct adapter padapter, RT_CHANNEL_INFO channel
		((BW40MINUS == o->bw) \|\| (BW40PLUS == o->bw)))
		continue;

		if (reg == NULL) {
		if (!reg) {
		reg = &channel_list->reg_class[cla];
		cla++;
		reg->reg_class = o->op_class;
		@@ -659,7 +659,7 @@ unsigned int OnProbeReq(struct adapter padapter, union recv_frame precv_frame)
		/* allocate a new one */
		DBG_871X("going to alloc stainfo for rc ="MAC_FMT"\n", MAC_ARG(get_sa(pframe)));
		psta = rtw_alloc_stainfo(pstapriv, get_sa(pframe));
		if (psta == NULL) {
		if (!psta) {
		/* TODO: */
		DBG_871X(" Exceed the upper limit of supported clients...\n");
		return _SUCCESS;
		@@ -1217,7 +1217,7 @@ unsigned int OnAssocReq(struct adapter padapter, union recv_frame precv_frame)
		}

		pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
		if (pstat == NULL) {
		if (!pstat) {
		status = _RSON_CLS2_;
		goto asoc_class2_error;
		}
		@@ -1377,7 +1377,7 @@ unsigned int OnAssocReq(struct adapter padapter, union recv_frame precv_frame)
		goto OnAssocReqFail;

		pstat->flags &= ~(WLAN_STA_WPS \| WLAN_STA_MAYBE_WPS);
		if (wpa_ie == NULL) {
		if (!wpa_ie) {
		if (elems.wps_ie) {
		DBG_871X("STA included WPS IE in "
		"(Re)Association Request - assume WPS is "
		@@ -1943,7 +1943,7 @@ unsigned int OnAction_back(struct adapter padapter, union recv_frame precv_fra
		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));
		@@ -2462,7 +2462,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
		/* DBG_871X("%s\n", __func__); */

		pmgntframe = alloc_mgtxmitframe(pxmitpriv);
		if (pmgntframe == NULL) {
		if (!pmgntframe) {
		DBG_871X("%s, alloc mgnt frame fail\n", __func__);
		return;
		}
		@@ -2843,7 +2843,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 */
		@@ -3909,7 +3909,7 @@ void issue_action_BA(struct adapter padapter, unsigned char raddr, unsigned ch
		DBG_871X("%s, category =%d, action =%d, status =%d\n", __func__, category, action, status);

		pmgntframe = alloc_mgtxmitframe(pxmitpriv);
		if (pmgntframe == NULL)
		if (!pmgntframe)
		return;

		/* update attribute */
		@@ -5033,12 +5033,12 @@ void report_survey_event(struct adapter padapter, union recv_frame precv_frame
		pcmdpriv = &padapter->cmdpriv;

		pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
		if (pcmd_obj == NULL)
		if (!pcmd_obj)
		return;

		cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));
		pevtcmd = rtw_zmalloc(cmdsz);
		if (pevtcmd == NULL) {
		if (!pevtcmd) {
		kfree(pcmd_obj);
		return;
		}
		@@ -5086,12 +5086,12 @@ void report_surveydone_event(struct adapter *padapter)
		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 surveydone_event) + sizeof(struct C2HEvent_Header));
		pevtcmd = rtw_zmalloc(cmdsz);
		if (pevtcmd == NULL) {
		if (!pevtcmd) {
		kfree(pcmd_obj);
		return;
		}
		@@ -5133,12 +5133,12 @@ void report_join_res(struct adapter *padapter, int res)
		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 joinbss_event) + sizeof(struct C2HEvent_Header));
		pevtcmd = rtw_zmalloc(cmdsz);
		if (pevtcmd == NULL) {
		if (!pevtcmd) {
		kfree(pcmd_obj);
		return;
		}
		@@ -5184,12 +5184,12 @@ void report_wmm_edca_update(struct adapter *padapter)
		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 wmm_event) + sizeof(struct C2HEvent_Header));
		pevtcmd = rtw_zmalloc(cmdsz);
		if (pevtcmd == NULL) {
		if (!pevtcmd) {
		kfree(pcmd_obj);
		return;
		}

Admin message