staging: rtl8188eu: remove else after break or return (0b4d1d0d) · Commits · 戴 / test

drivers/staging/rtl8188eu/core/rtw_efuse.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -497,7 +497,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st

		if (!PgWriteSuccess)
		return false;
		else

		efuse_addr = Efuse_GetCurrentSize(pAdapter);
		} else {
		efuse_addr = efuse_addr + (pFixPkt->word_cnts * 2) + 1;
		@@ -713,10 +713,9 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u
		if (ALL_WORDS_DISABLED(efuse_data)) {
		ret = false;
		break;
		} else {
		}
		curPkt.offset = ((cur_header & 0xE0) >> 5) \| ((efuse_data & 0xF0) >> 1);
		curPkt.word_en = efuse_data & 0x0F;
		}
		} else {
		cur_header = efuse_data;
		curPkt.offset = (cur_header >> 4) & 0x0F;

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -157,11 +157,10 @@ u8 rtw_get_ie(u8 pbuf, int index, uint *len, int limit)
		if (*p == index) {
		len = (p + 1);
		return p;
		} else {
		}
		tmp = *(p + 1);
		p += (tmp + 2);
		i += (tmp + 2);
		}
		if (i >= limit)
		break;
		}
		@@ -295,10 +294,9 @@ unsigned char rtw_get_wpa_ie(unsigned char pie, uint *wpa_ie_len, int limit)
		goto check_next_ie;
		wpa_ie_len = (pbuf + 1);
		return pbuf;
		} else {
		}
		*wpa_ie_len = 0;
		return NULL;
		}

		check_next_ie:
		limit_new = limit - (pbuf - pie) - 2 - len;
		@@ -596,9 +594,8 @@ u8 rtw_get_wps_ie(u8 in_ie, uint in_len, u8 wps_ie, uint wps_ielen)
		cnt += in_ie[cnt + 1] + 2;

		break;
		} else {
		cnt += in_ie[cnt + 1] + 2; /* goto next */
		}
		cnt += in_ie[cnt + 1] + 2; /* goto next */
		}
		return wpsie_ptr;
		}
		@@ -642,9 +639,8 @@ u8 rtw_get_wps_attr(u8 wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att
		if (len_attr)
		*len_attr = attr_len;
		break;
		} else {
		attr_ptr += attr_len; /* goto next */
		}
		attr_ptr += attr_len; /* goto next */
		}
		return target_attr_ptr;
		}

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+23 −26

Original line number	Diff line number	Diff line
		@@ -1865,6 +1865,7 @@ unsigned int send_beacon(struct adapter *padapter)
		int issue = 0;
		int poll = 0;
		unsigned long start = jiffies;
		u32 passing_time;

		rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
		do {
		@@ -1883,8 +1884,8 @@ unsigned int send_beacon(struct adapter *padapter)
		DBG_88E("%s fail! %u ms\n", __func__,
		jiffies_to_msecs(jiffies - start));
		return _FAIL;
		} else {
		u32 passing_time = jiffies_to_msecs(jiffies - start);
		}
		passing_time = jiffies_to_msecs(jiffies - start);

		if (passing_time > 100 \|\| issue > 3)
		DBG_88E("%s success, issue:%d, poll:%d, %u ms\n",
		@@ -1892,7 +1893,6 @@ unsigned int send_beacon(struct adapter *padapter)
		jiffies_to_msecs(jiffies - start));
		return _SUCCESS;
		}
		}

		/****************************************************************************

		@@ -2864,10 +2864,9 @@ static unsigned int OnAuthClient(struct adapter *padapter,
		set_link_timer(pmlmeext, REAUTH_TO);

		return _SUCCESS;
		} else {
		}
		/* open system */
		go2asoc = 1;
		}
		} else if (seq == 4) {
		if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared)
		go2asoc = 1;
		@@ -3453,14 +3452,13 @@ static unsigned int OnDeAuth(struct adapter *padapter,
		}

		return _SUCCESS;
		} else
		}
		#endif
		{
		DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM\n",
		reason, GetAddr3Ptr(pframe));

		receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
		}

		pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
		return _SUCCESS;
		}
		@@ -3507,14 +3505,13 @@ static unsigned int OnDisassoc(struct adapter *padapter,
		}

		return _SUCCESS;
		} else
		}
		#endif
		{
		DBG_88E_LEVEL(_drv_always_, "ap recv disassoc reason code(%d) sta:%pM\n",
		reason, GetAddr3Ptr(pframe));

		receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
		}

		pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
		return _SUCCESS;
		}
		@@ -5277,11 +5274,11 @@ u8 set_stakey_hdl(struct adapter padapter, u8 pbuf)
		write_cam(padapter, cam_id, ctrl, pparm->addr, pparm->key);

		return H2C_SUCCESS_RSP;
		} else {
		}

		DBG_88E("r871x_set_stakey_hdl(): sta has been free\n");
		return H2C_REJECTED;
		}
		}

		/* below for sta mode */

drivers/staging/rtl8188eu/core/rtw_wlan_util.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -1247,9 +1247,8 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
		if (ralink_vendor_flag) {
		DBG_88E("link to Tenda W311R AP\n");
		return HT_IOT_PEER_TENDA;
		} else {
		DBG_88E("Capture EPIGRAM_OUI\n");
		}
		DBG_88E("Capture EPIGRAM_OUI\n");
		} else {
		break;
		}
		@@ -1266,11 +1265,10 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
		} else if (ralink_vendor_flag && epigram_vendor_flag) {
		DBG_88E("link to Tenda W311R AP\n");
		return HT_IOT_PEER_TENDA;
		} else {
		}
		DBG_88E("link to new AP\n");
		return HT_IOT_PEER_UNKNOWN;
		}
		}

		void update_IOT_info(struct adapter *padapter)
		{

drivers/staging/rtl8188eu/core/rtw_xmit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1022,10 +1022,10 @@ s32 rtw_xmitframe_coalesce(struct adapter padapter, struct sk_buff pkt, struct
		ClearMFrag(mem_start);

		break;
		} else {
		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));
		}

		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));

		addr = (size_t)(pframe);

		mem_start = (unsigned char *)round_up(addr, 4) + hw_hdr_offset;

Admin message