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

staging: rtl8188eu: remove unnecessary parentheses 



Remove unnecessary parentheses as reported by checkpatch
and from conditionals.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ad53b2d

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+25 −25
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ u8 rtw_do_join(struct adapter *padapter) 
{

	struct list_head *plist, *phead;

	u8 *pibss = NULL;

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	u8 ret = _SUCCESS;



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

	spin_lock_bh(&pmlmepriv->scanned_queue.lock);

	phead = get_list_head(queue);

	plist = phead->next;
@@ -36,7 +36,7 @@ u8 rtw_do_join(struct adapter *padapter) 
	pmlmepriv->to_join = true;



	if (list_empty(&queue->queue)) {

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

		spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);



		/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
@@ -60,7 +60,7 @@ u8 rtw_do_join(struct adapter *padapter) 
	} else {

		int select_ret;



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

		spin_unlock_bh(&pmlmepriv->scanned_queue.lock);

		select_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);

		if (select_ret == _SUCCESS) {

			pmlmepriv->to_join = false;
@@ -71,7 +71,7 @@ u8 rtw_do_join(struct adapter *padapter) 
				/*  submit createbss_cmd to change to a ADHOC_MASTER */



				/* pmlmepriv->lock has been acquired by caller... */

				struct wlan_bssid_ex    *pdev_network = &(padapter->registrypriv.dev_network);

				struct wlan_bssid_ex    *pdev_network = &padapter->registrypriv.dev_network;



				pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
@@ -172,7 +172,7 @@ handle_tkip_countermeasure: 
	if (padapter->securitypriv.btkip_countermeasure) {

		cur_time = jiffies;



		if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ) {

		if (cur_time - padapter->securitypriv.btkip_countermeasure_time > 60 * HZ) {

			padapter->securitypriv.btkip_countermeasure = false;

			padapter->securitypriv.btkip_countermeasure_time = 0;

		} else {
@@ -229,8 +229,8 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 
		RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,

			 ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"));



		if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) &&

		    (!memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength))) {

		if (pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength &&

		    !memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength)) {

			if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false)) {

				RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,

					 ("Set SSID is the same ssid, fw_state = 0x%08x\n",
@@ -279,7 +279,7 @@ handle_tkip_countermeasure: 
	if (padapter->securitypriv.btkip_countermeasure) {

		cur_time = jiffies;



		if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ) {

		if (cur_time - padapter->securitypriv.btkip_countermeasure_time > 60 * HZ) {

			padapter->securitypriv.btkip_countermeasure = false;

			padapter->securitypriv.btkip_countermeasure_time = 0;

		} else {
@@ -310,7 +310,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, 
{

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct	wlan_network	*cur_network = &pmlmepriv->cur_network;

	enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode);

	enum ndis_802_11_network_infra *pold_state = &cur_network->network.InfrastructureMode;



	RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,

		 ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
@@ -331,15 +331,15 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, 
#endif

		}



		if ((check_fwstate(pmlmepriv, _FW_LINKED)) ||

		    (*pold_state == Ndis802_11IBSS))

		if (check_fwstate(pmlmepriv, _FW_LINKED) ||

		    *pold_state == Ndis802_11IBSS)

			rtw_disassoc_cmd(padapter, 0, true);



		if ((check_fwstate(pmlmepriv, _FW_LINKED)) ||

		    (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)))

		if (check_fwstate(pmlmepriv, _FW_LINKED) ||

		    check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))

			rtw_free_assoc_resources(padapter);



		if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {

		if (*pold_state == Ndis802_11Infrastructure || *pold_state == Ndis802_11IBSS) {

			if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

				rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have checked whether  issue dis-assoc_cmd or not */

	       }
@@ -409,8 +409,8 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s 
		goto exit;

	}



	if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) ||

	    (pmlmepriv->LinkDetectInfo.bBusyTraffic)) {

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) ||

	    pmlmepriv->LinkDetectInfo.bBusyTraffic) {

		/*  Scan or linking is in progress, do nothing. */

		RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("%s fail since fw_state = %x\n", __func__, get_fwstate(pmlmepriv)));

		res = true;
@@ -468,7 +468,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11 
u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)

{

	int		keyid, res;

	struct security_priv *psecuritypriv = &(padapter->securitypriv);

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	u8		ret = _SUCCESS;



	keyid = wep->KeyIndex & 0x3fffffff;
@@ -497,7 +497,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) 
		 ("rtw_set_802_11_add_wep:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x  keyid =%x\n",

		 wep->KeyLength, wep->KeyIndex, keyid));



	memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]), &(wep->KeyMaterial), wep->KeyLength);

	memcpy(&psecuritypriv->dot11DefKey[keyid].skey[0], &wep->KeyMaterial, wep->KeyLength);



	psecuritypriv->dot11DefKeylen[keyid] = wep->KeyLength;
@@ -539,15 +539,15 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
	u8	*p;

	u16	rate = 0, max_rate = 0;

	struct mlme_ext_priv	*pmlmeext = &adapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;

	struct registry_priv *pregistrypriv = &adapter->registrypriv;

	struct mlme_priv	*pmlmepriv = &adapter->mlmepriv;

	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;

	u8	bw_40MHz = 0, short_GI_20 = 0, short_GI_40 = 0;

	u32	ht_ielen = 0;



	if ((!check_fwstate(pmlmepriv, _FW_LINKED)) &&

	    (!check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)))

	if (!check_fwstate(pmlmepriv, _FW_LINKED) &&

	    !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))

		return 0;



	if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N|WIRELESS_11_5N)) {
@@ -561,14 +561,14 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 


			max_rate = rtw_mcs_rate(

				RF_1T1R,

				bw_40MHz & (pregistrypriv->cbw40_enable),

				bw_40MHz & pregistrypriv->cbw40_enable,

				short_GI_20,

				short_GI_40,

				pmlmeinfo->HT_caps.mcs.rx_mask

			);

		}

	} else {

		while ((pcur_bss->SupportedRates[i] != 0) && (pcur_bss->SupportedRates[i] != 0xFF)) {

		while (pcur_bss->SupportedRates[i] != 0 && pcur_bss->SupportedRates[i] != 0xFF) {

			rate = pcur_bss->SupportedRates[i]&0x7F;

			if (rate > max_rate)

				max_rate = rate;

CRA Git | Maintained and supported by SUSTech CRA and CCSE