Commit 41f0666f authored by Fan Fei's avatar Fan Fei Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Fix long lines 



This patch fix long lines found by checkpatch.

Signed-off-by: default avatarFan Fei <ffclaire1224@gmail.com>
Link: https://lore.kernel.org/r/20201008185524.brl467kucslxoxci@ubuntu-T470


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

drivers/staging/rtl8188eu/core/rtw_cmd.c

+51 −23
Original line number Diff line number Diff line
@@ -159,14 +159,16 @@ int rtw_cmd_thread(void *context) 
		if (padapter->bDriverStopped ||

		    padapter->bSurpriseRemoved) {

			DBG_88E("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",

				__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);

				__func__, padapter->bDriverStopped,

				padapter->bSurpriseRemoved, __LINE__);

			break;

		}

_next:

		if (padapter->bDriverStopped ||

		    padapter->bSurpriseRemoved) {

			DBG_88E("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",

				__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);

				__func__, padapter->bDriverStopped,

				padapter->bSurpriseRemoved, __LINE__);

			break;

		}
@@ -195,14 +197,18 @@ _next: 
		if (pcmd->cmdcode < ARRAY_SIZE(rtw_cmd_callback)) {

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

			if (!pcmd_callback) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n", pcmd_callback, pcmd->cmdcode));

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

					 ("mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n",

					  pcmd_callback, pcmd->cmdcode));

				rtw_free_cmd_obj(pcmd);

			} else {

				/* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!= NULL) */

				pcmd_callback(pcmd->padapter, pcmd);/* need consider that free cmd_obj in rtw_cmd_callback */

			}

		} else {

			RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("%s: cmdcode = 0x%x callback not defined!\n", __func__, pcmd->cmdcode));

			RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

				 ("%s: cmdcode = 0x%x callback not defined!\n",

				  __func__, pcmd->cmdcode));

			rtw_free_cmd_obj(pcmd);

		}
@@ -264,7 +270,8 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 


		for (i = 0; i < ssid_num && i < RTW_SSID_SCAN_AMOUNT; i++) {

			if (ssid[i].ssid_length) {

				memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(struct ndis_802_11_ssid));

				memcpy(&psurveyPara->ssid[i], &ssid[i],

				       sizeof(struct ndis_802_11_ssid));

				psurveyPara->ssid_num++;

			}

		}
@@ -276,7 +283,8 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 


		for (i = 0; i < ch_num && i < RTW_CHANNEL_SCAN_AMOUNT; i++) {

			if (ch[i].hw_value && !(ch[i].flags & RTW_IEEE80211_CHAN_DISABLED)) {

				memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel));

				memcpy(&psurveyPara->ch[i], &ch[i],

				       sizeof(struct rtw_ieee80211_channel));

				psurveyPara->ch_num++;

			}

		}
@@ -317,9 +325,11 @@ u8 rtw_createbss_cmd(struct adapter *padapter) 
	led_control_8188eu(padapter, LED_CTL_START_TO_LINK);



	if (pmlmepriv->assoc_ssid.ssid_length == 0)

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for Any SSid:%s\n", pmlmepriv->assoc_ssid.ssid));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

			 (" createbss for Any SSid:%s\n", pmlmepriv->assoc_ssid.ssid));

	else

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.ssid));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,

			 (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.ssid));



	pcmd = kzalloc(sizeof(*pcmd), GFP_ATOMIC);

	if (!pcmd) {
@@ -361,7 +371,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	if (pmlmepriv->assoc_ssid.ssid_length == 0)

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n"));

	else

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.ssid));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_,

			 ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.ssid));



	pcmd = kzalloc(sizeof(*pcmd), GFP_ATOMIC);

	if (!pcmd) {
@@ -406,7 +417,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->ie_length;



	if (psecnetwork->ie_length - 12 < 255)

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], psecnetwork->ie_length - 12);

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12],

		       psecnetwork->ie_length - 12);

	else

		memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], 255);
@@ -419,14 +431,19 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	if (!pmlmepriv->assoc_by_bssid)

		memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.MacAddress[0], ETH_ALEN);



	psecnetwork->ie_length = rtw_restruct_sec_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length);

	psecnetwork->ie_length = rtw_restruct_sec_ie(padapter, &pnetwork->network.ies[0],

						     &psecnetwork->ies[0],

						     pnetwork->network.ie_length);



	pqospriv->qos_option = 0;



	if (pregistrypriv->wmm_enable) {

		u32 tmp_len;



		tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length, psecnetwork->ie_length);

		tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.ies[0],

					      &psecnetwork->ies[0],

					      pnetwork->network.ie_length,

					      psecnetwork->ie_length);



		if (psecnetwork->ie_length != tmp_len) {

			psecnetwork->ie_length = tmp_len;
@@ -448,7 +465,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
		    (padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_) &&

		    (padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {

			/* rtw_restructure_ht_ie */

			rtw_restructure_ht_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0],

			rtw_restructure_ht_ie(padapter, &pnetwork->network.ies[0],

					      &psecnetwork->ies[0],

					      pnetwork->network.ie_length, &psecnetwork->ie_length);

		}

	}
@@ -573,7 +591,8 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key) 
	if (unicast_key)

		memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);

	else

		memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);

		memcpy(&psetstakey_para->key,

		       &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);



	/* jeff: set this because at least sw key is ready */

	padapter->securitypriv.busetkipkey = true;
@@ -760,7 +779,8 @@ static void traffic_status_watchdog(struct adapter *padapter) 
		    pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 100) {

			bBusyTraffic = true;



			if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)

			if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod >

			    pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)

				bRxBusyTraffic = true;

			else

				bTxBusyTraffic = true;
@@ -771,7 +791,8 @@ static void traffic_status_watchdog(struct adapter *padapter) 
		    pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) {

			bHigherBusyTraffic = true;



			if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)

			if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod >

			    pmlmepriv->LinkDetectInfo.NumTxOkInPeriod)

				bHigherBusyRxTraffic = true;

			else

				bHigherBusyTxTraffic = true;
@@ -1127,7 +1148,8 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
	} else if (pcmd->res != H2C_SUCCESS) {

		mod_timer(&pmlmepriv->scan_to_timer,

			  jiffies + msecs_to_jiffies(1));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));

	}



	/*  free cmd */
@@ -1143,7 +1165,8 @@ void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		set_fwstate(pmlmepriv, _FW_LINKED);

		spin_unlock_bh(&pmlmepriv->lock);



		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n."));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\n ***Error: disconnect_cmd_callback Fail ***\n."));

		return;

	}
@@ -1161,7 +1184,8 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	} else if (pcmd->res != H2C_SUCCESS) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n"));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n"));

		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));

	}
@@ -1193,7 +1217,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		if (!psta) {

			psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);

			if (!psta) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nCan't alloc sta_info when createbss_cmd_callback\n"));

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

					 ("\nCan't alloc sta_info when createbss_cmd_callback\n"));

				goto createbss_cmd_fail;

			}

		}
@@ -1205,7 +1230,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		if (!pwlan) {

			pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);

			if (!pwlan) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n Error:  can't get pwlan in rtw_joinbss_event_callback\n"));

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

					 ("\n Error:  can't get pwlan in rtw_joinbss_event_callback\n"));

				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

				goto createbss_cmd_fail;

			}
@@ -1242,7 +1268,8 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc 
	struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);



	if (!psta) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: %s => can't get sta_info\n\n", __func__));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\nERROR: %s => can't get sta_info\n\n", __func__));

		goto exit;

	}

exit:
@@ -1258,7 +1285,8 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj * 
	struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);



	if (!psta) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: %s => can't get sta_info\n\n", __func__));

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,

			 ("\nERROR: %s => can't get sta_info\n\n", __func__));

		goto exit;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE