Commit bd2bc4c7 authored Aug 02, 2010 by Andres More Committed by Greg Kroah-Hartman Aug 31, 2010

staging: vt6656: added spaces around '||'



Cleared checkpatch ERROR: spaces required around that '||'

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent a3d7fc5c

drivers/staging/vt6656/iwctl.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1598,7 +1598,8 @@ int iwctl_siwauth(struct net_device *dev,
	pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;		pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;
	}else if(pairwise == IW_AUTH_CIPHER_TKIP){		}else if(pairwise == IW_AUTH_CIPHER_TKIP){
	pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;		pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;
	}else if(pairwise == IW_AUTH_CIPHER_WEP40\|\|pairwise == IW_AUTH_CIPHER_WEP104){		} else if (pairwise == IW_AUTH_CIPHER_WEP40 \|\|
			pairwise == IW_AUTH_CIPHER_WEP104) {
	pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;		pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
	}else if(pairwise == IW_AUTH_CIPHER_NONE){		}else if(pairwise == IW_AUTH_CIPHER_NONE){
	//do nothing,einsn liu		//do nothing,einsn liu

drivers/staging/vt6656/wmgr.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2638,7 +2638,8 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)

	if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){		if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){

	if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA)\|\|(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {		if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) \|\|
			(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
	/*		/*
	if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {		if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {
	if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) {		if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) {
	@@ -4768,7 +4769,8 @@ s_bCipherMatch (
	if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&		if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
	(pBSSNode->bWPA2Valid == TRUE) &&		(pBSSNode->bWPA2Valid == TRUE) &&
	//20080123-01,<Add> by Einsn Liu		//20080123-01,<Add> by Einsn Liu
	((EncStatus == Ndis802_11Encryption3Enabled)\|\|(EncStatus == Ndis802_11Encryption2Enabled))) {		((EncStatus == Ndis802_11Encryption3Enabled) \|\|
			(EncStatus == Ndis802_11Encryption2Enabled))) {
	//WPA2		//WPA2
	// check Group Key Cipher		// check Group Key Cipher
	if ((pBSSNode->byCSSGK == WLAN_11i_CSS_WEP40) \|\|		if ((pBSSNode->byCSSGK == WLAN_11i_CSS_WEP40) \|\|

drivers/staging/vt6656/rxtx.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/staging/vt6656/dpc.c

+2 −2

File changed.

Contains only whitespace changes.