UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: vt6656: Remove line feeds before else 

An else belongs in the same line as the closing curly brace of the
previous block. Hence, this patch removes line feeds separating a
curly brace from the corresponding else.

Signed-off-by: Sebastian Rachuj <sebastian.rachuj@studium.uni-erlangen.de>
Signed-off-by: Simon Schuster <linux@rationality.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Simon Schuster 2014-01-04 16:25:11 +01:00 committed by Greg Kroah-Hartman
parent 77226ed70b
commit dad2ddbdbf
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/staging/vt6656/bssdb.c
View File

@ -649,8 +649,7 @@ void BSSvCreateOneNode(struct vnt_private *pDevice, u32 *puNodeIndex)
BigestCount = pMgmt->sNodeDBTable[ii].uInActiveCount; BigestCount = pMgmt->sNodeDBTable[ii].uInActiveCount;
SelectIndex = ii; SelectIndex = ii;
} }
} } else {
else {
break; break;
} }
} }
@ -664,8 +663,7 @@ void BSSvCreateOneNode(struct vnt_private *pDevice, u32 *puNodeIndex)
while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL) while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL)
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} } else {
else {
*puNodeIndex = ii; *puNodeIndex = ii;
} }
@ -822,8 +820,7 @@ void BSSvSecondCallBack(struct work_struct *work)
if (pDevice->wUseProtectCntDown > 0) { if (pDevice->wUseProtectCntDown > 0) {
pDevice->wUseProtectCntDown--; pDevice->wUseProtectCntDown--;
} } else {
else {
/* disable protect mode */ /* disable protect mode */
pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1)); pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
} }
@ -841,8 +838,7 @@ void BSSvSecondCallBack(struct work_struct *work)
PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n"); PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL); wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
} }
} } else if (pDevice->bLinkPass == true)
else if (pDevice->bLinkPass == true)
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
} }
@ -895,8 +891,7 @@ void BSSvSecondCallBack(struct work_struct *work)
/* ii = 0 for multicast node (AP & Adhoc) */ /* ii = 0 for multicast node (AP & Adhoc) */
RATEvTxRateFallBack((void *) pDevice, RATEvTxRateFallBack((void *) pDevice,
&(pMgmt->sNodeDBTable[ii])); &(pMgmt->sNodeDBTable[ii]));
} } else {
else {
/* ii = 0 reserved for unicast AP node (Infra STA) */ /* ii = 0 reserved for unicast AP node (Infra STA) */
if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)
RATEvTxRateFallBack((void *) pDevice, RATEvTxRateFallBack((void *) pDevice,
@ -927,8 +922,7 @@ void BSSvSecondCallBack(struct work_struct *work)
MACvEnableProtectMD(pDevice); MACvEnableProtectMD(pDevice);
pDevice->bProtectMode = true; pDevice->bProtectMode = true;
} }
} } else {
else {
if (pDevice->bProtectMode) { if (pDevice->bProtectMode) {
MACvDisableProtectMD(pDevice); MACvDisableProtectMD(pDevice);
pDevice->bProtectMode = false; pDevice->bProtectMode = false;
@ -942,8 +936,7 @@ void BSSvSecondCallBack(struct work_struct *work)
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
vUpdateIFS((void *) pDevice); vUpdateIFS((void *) pDevice);
} }
} } else {
else {
if (!pDevice->bShortSlotTime) { if (!pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = true; pDevice->bShortSlotTime = true;
BBvSetShortSlotTime(pDevice); BBvSetShortSlotTime(pDevice);
@ -958,8 +951,7 @@ void BSSvSecondCallBack(struct work_struct *work)
MACvEnableBarkerPreambleMd(pDevice); MACvEnableBarkerPreambleMd(pDevice);
pDevice->bBarkerPreambleMd = true; pDevice->bBarkerPreambleMd = true;
} }
} } else {
else {
if (pDevice->bBarkerPreambleMd) { if (pDevice->bBarkerPreambleMd) {
MACvDisableBarkerPreambleMd(pDevice); MACvDisableBarkerPreambleMd(pDevice);
pDevice->bBarkerPreambleMd = false; pDevice->bBarkerPreambleMd = false;
@ -1017,8 +1009,7 @@ void BSSvSecondCallBack(struct work_struct *work)
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL); wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
} }
} }
} } else if (pItemSSID->len != 0) {
else if (pItemSSID->len != 0) {
/* Davidwang */ /* Davidwang */
if ((pDevice->bEnableRoaming == true)&&(!(pMgmt->Cisco_cckm))) { if ((pDevice->bEnableRoaming == true)&&(!(pMgmt->Cisco_cckm))) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bRoaming %d, !\n", pDevice->bRoaming); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bRoaming %d, !\n", pDevice->bRoaming);
@ -1035,21 +1026,18 @@ void BSSvSecondCallBack(struct work_struct *work)
pDevice->uAutoReConnectTime = 0; pDevice->uAutoReConnectTime = 0;
pDevice->uIsroamingTime = 0; pDevice->uIsroamingTime = 0;
pDevice->bRoaming = false; pDevice->bRoaming = false;
} } else if ((pDevice->bRoaming == false) && (pDevice->bIsRoaming == true)) {
else if ((pDevice->bRoaming == false) && (pDevice->bIsRoaming == true)) {
pDevice->uIsroamingTime++; pDevice->uIsroamingTime++;
if (pDevice->uIsroamingTime >= 20) if (pDevice->uIsroamingTime >= 20)
pDevice->bIsRoaming = false; pDevice->bIsRoaming = false;
} }
} } else {
else {
if (pDevice->uAutoReConnectTime < 10) { if (pDevice->uAutoReConnectTime < 10) {
pDevice->uAutoReConnectTime++; pDevice->uAutoReConnectTime++;
/* network manager support need not do Roaming scan??? */ /* network manager support need not do Roaming scan??? */
if (pDevice->bWPASuppWextEnabled == true) if (pDevice->bWPASuppWextEnabled == true)
pDevice->uAutoReConnectTime = 0; pDevice->uAutoReConnectTime = 0;
} } else {
else {
/* mike use old encryption status for wpa reauthen */ /* mike use old encryption status for wpa reauthen */
if (pDevice->bWPADEVUp) if (pDevice->bWPADEVUp)
pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus; pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus;
@ -1074,8 +1062,7 @@ void BSSvSecondCallBack(struct work_struct *work)
if ((pMgmt->eCurrState == WMAC_STATE_STARTED) && (pCurrSSID->len == 0)) { if ((pMgmt->eCurrState == WMAC_STATE_STARTED) && (pCurrSSID->len == 0)) {
if (pDevice->uAutoReConnectTime < 10) { if (pDevice->uAutoReConnectTime < 10) {
pDevice->uAutoReConnectTime++; pDevice->uAutoReConnectTime++;
} } else {
else {
DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scanning ...\n"); DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scanning ...\n");
pMgmt->eScanType = WMAC_SCAN_ACTIVE; pMgmt->eScanType = WMAC_SCAN_ACTIVE;
bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL); bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);