Commit 566597a3 authored by Nandini Hanumanthagowda's avatar Nandini Hanumanthagowda Committed by Greg Kroah-Hartman

staging: vt6656: removed unnecessary braces around if-else statements

removed unnecessary braces around if-else statement whenever
the if-else construct was followed by just single line of code
to comply with linux coding style
Signed-off-by: default avatarNandini Hanumanthagowda <nandu.hgowda@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cfa1b25
...@@ -108,9 +108,7 @@ static void vAdHocBeaconStop(struct vnt_private *pDevice) ...@@ -108,9 +108,7 @@ static void vAdHocBeaconStop(struct vnt_private *pDevice)
bStop = true; bStop = true;
} }
if (pMgmt->uIBSSChannel > CB_MAX_CHANNEL_24G) if (pMgmt->uIBSSChannel > CB_MAX_CHANNEL_24G)
{
bStop = true; bStop = true;
}
} }
if (bStop) if (bStop)
...@@ -182,13 +180,13 @@ static void s_vProbeChannel(struct vnt_private *pDevice) ...@@ -182,13 +180,13 @@ static void s_vProbeChannel(struct vnt_private *pDevice)
u8 *pbyRate; u8 *pbyRate;
int ii; int ii;
if (pDevice->byBBType == BB_TYPE_11A) { if (pDevice->byBBType == BB_TYPE_11A)
pbyRate = &abyCurrSuppRatesA[0]; pbyRate = &abyCurrSuppRatesA[0];
} else if (pDevice->byBBType == BB_TYPE_11B) { else if (pDevice->byBBType == BB_TYPE_11B)
pbyRate = &abyCurrSuppRatesB[0]; pbyRate = &abyCurrSuppRatesB[0];
} else { else
pbyRate = &abyCurrSuppRatesG[0]; pbyRate = &abyCurrSuppRatesG[0];
}
// build an assocreq frame and send it // build an assocreq frame and send it
pTxPacket = s_MgrMakeProbeRequest pTxPacket = s_MgrMakeProbeRequest
( (
...@@ -204,10 +202,9 @@ static void s_vProbeChannel(struct vnt_private *pDevice) ...@@ -204,10 +202,9 @@ static void s_vProbeChannel(struct vnt_private *pDevice)
for (ii = 0; ii < 1; ii++) { for (ii = 0; ii < 1; ii++) {
if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail.. \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail.. \n");
} } else {
else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending.. \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending.. \n");
} }
} }
} }
...@@ -316,9 +313,8 @@ void vRunCommand(struct work_struct *work) ...@@ -316,9 +313,8 @@ void vRunCommand(struct work_struct *work)
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID; pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID;
if (pMgmt->uScanChannel == 0) { if (pMgmt->uScanChannel == 0)
pMgmt->uScanChannel = pDevice->byMinChannel; pMgmt->uScanChannel = pDevice->byMinChannel;
}
if (pMgmt->uScanChannel > pDevice->byMaxChannel) { if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
pDevice->eCommandState = WLAN_CMD_SCAN_END; pDevice->eCommandState = WLAN_CMD_SCAN_END;
s_bCommandComplete(pDevice); s_bCommandComplete(pDevice);
...@@ -546,9 +542,8 @@ void vRunCommand(struct work_struct *work) ...@@ -546,9 +542,8 @@ void vRunCommand(struct work_struct *work)
// if Adhoc mode // if Adhoc mode
else if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { else if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
if (pMgmt->eCurrState == WMAC_STATE_JOINTED) { if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
if (netif_queue_stopped(pDevice->dev)) { if (netif_queue_stopped(pDevice->dev))
netif_wake_queue(pDevice->dev); netif_wake_queue(pDevice->dev);
}
pDevice->bLinkPass = true; pDevice->bLinkPass = true;
ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER); ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
pMgmt->sNodeDBTable[0].bActive = true; pMgmt->sNodeDBTable[0].bActive = true;
...@@ -654,9 +649,8 @@ void vRunCommand(struct work_struct *work) ...@@ -654,9 +649,8 @@ void vRunCommand(struct work_struct *work)
ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER); ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
s_bClearBSSID_SCAN(pDevice); s_bClearBSSID_SCAN(pDevice);
if (netif_queue_stopped(pDevice->dev)) { if (netif_queue_stopped(pDevice->dev))
netif_wake_queue(pDevice->dev); netif_wake_queue(pDevice->dev);
}
} }
else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) { else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
...@@ -700,9 +694,8 @@ void vRunCommand(struct work_struct *work) ...@@ -700,9 +694,8 @@ void vRunCommand(struct work_struct *work)
pDevice->byRxMode &= ~RCR_UNICAST; pDevice->byRxMode &= ~RCR_UNICAST;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode);
BSSvAddMulticastNode(pDevice); BSSvAddMulticastNode(pDevice);
if (netif_queue_stopped(pDevice->dev)) { if (netif_queue_stopped(pDevice->dev))
netif_wake_queue(pDevice->dev); netif_wake_queue(pDevice->dev);
}
pDevice->bLinkPass = true; pDevice->bLinkPass = true;
ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER); ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
schedule_delayed_work(&pDevice->second_callback_work, HZ); schedule_delayed_work(&pDevice->second_callback_work, HZ);
...@@ -722,9 +715,8 @@ void vRunCommand(struct work_struct *work) ...@@ -722,9 +715,8 @@ void vRunCommand(struct work_struct *work)
pDevice->bMoreData = true; pDevice->bMoreData = true;
} }
if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0) { if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail \n");
}
pMgmt->sNodeDBTable[0].wEnQueueCnt--; pMgmt->sNodeDBTable[0].wEnQueueCnt--;
} }
...@@ -747,9 +739,8 @@ void vRunCommand(struct work_struct *work) ...@@ -747,9 +739,8 @@ void vRunCommand(struct work_struct *work)
pDevice->bMoreData = true; pDevice->bMoreData = true;
} }
if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0) { if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail \n");
}
pMgmt->sNodeDBTable[ii].wEnQueueCnt--; pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
// check if sta ps enable, wait next pspoll // check if sta ps enable, wait next pspoll
...@@ -973,11 +964,10 @@ static int s_bCommandComplete(struct vnt_private *pDevice) ...@@ -973,11 +964,10 @@ static int s_bCommandComplete(struct vnt_private *pDevice)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_BSSID_SCAN\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_BSSID_SCAN\n");
pDevice->eCommandState = WLAN_CMD_SCAN_START; pDevice->eCommandState = WLAN_CMD_SCAN_START;
pMgmt->uScanChannel = 0; pMgmt->uScanChannel = 0;
if (pSSID->len != 0) { if (pSSID->len != 0)
memcpy(pMgmt->abyScanSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memcpy(pMgmt->abyScanSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
} else { else
memset(pMgmt->abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memset(pMgmt->abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
}
/* /*
if ((bForceSCAN == false) && (pDevice->bLinkPass == true)) { if ((bForceSCAN == false) && (pDevice->bLinkPass == true)) {
if ((pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) && if ((pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) &&
...@@ -1054,9 +1044,8 @@ int bScheduleCommand(struct vnt_private *pDevice, ...@@ -1054,9 +1044,8 @@ int bScheduleCommand(struct vnt_private *pDevice,
CMD_CODE eCommand, u8 *pbyItem0) CMD_CODE eCommand, u8 *pbyItem0)
{ {
if (pDevice->cbFreeCmdQueue == 0) { if (pDevice->cbFreeCmdQueue == 0)
return (false); return (false);
}
pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand; pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand;
pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true; pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true;
memset(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID, 0 , WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memset(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID, 0 , WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
...@@ -1094,11 +1083,9 @@ int bScheduleCommand(struct vnt_private *pDevice, ...@@ -1094,11 +1083,9 @@ int bScheduleCommand(struct vnt_private *pDevice,
ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdEnqueueIdx, CMD_Q_SIZE); ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdEnqueueIdx, CMD_Q_SIZE);
pDevice->cbFreeCmdQueue--; pDevice->cbFreeCmdQueue--;
if (pDevice->bCmdRunning == false) { if (pDevice->bCmdRunning == false)
s_bCommandComplete(pDevice); s_bCommandComplete(pDevice);
}
else {
}
return (true); return (true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment