summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/dpc.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-18 20:55:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 11:16:17 -0700
commit96d69e201bbdb05c363e899138f9f42bc8ad8f88 (patch)
treef3ba7f8c5436cfbce1617f415febbd681fe78fd4 /drivers/staging/vt6655/dpc.c
parentbda2a44e2a015535f08aecd5c98e263098db9e75 (diff)
downloadop-kernel-dev-96d69e201bbdb05c363e899138f9f42bc8ad8f88.zip
op-kernel-dev-96d69e201bbdb05c363e899138f9f42bc8ad8f88.tar.gz
staging: vt6655: Remove unnecessary blank lines
Remove a bunch of useless vertical whitespace. Convert 3 or more consecutive newlines to 2. Remove blank lines after open brace and before close brace. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/dpc.c')
-rw-r--r--drivers/staging/vt6655/dpc.c53
1 files changed, 0 insertions, 53 deletions
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index e078aa3..a9533f3 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -55,8 +55,6 @@
#include "iowpa.h"
#include "aes_ccmp.h"
-
-
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
@@ -68,7 +66,6 @@ static int msglevel = MSG_LEVEL_INFO;
const unsigned char acbyRxRate[MAX_RATE] =
{2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108};
-
/*--------------------- Static Functions --------------------------*/
/*--------------------- Static Definitions -------------------------*/
@@ -77,7 +74,6 @@ const unsigned char acbyRxRate[MAX_RATE] =
static unsigned char s_byGetRateIdx(unsigned char byRate);
-
static void
s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
PSEthernetHeader psEthHeader);
@@ -93,8 +89,6 @@ static bool s_bAPModeRxCtl(
int iSANodeIndex
);
-
-
static bool s_bAPModeRxData(
PSDevice pDevice,
struct sk_buff *skb,
@@ -104,7 +98,6 @@ static bool s_bAPModeRxData(
int iDANodeIndex
);
-
static bool s_bHandleRxEncryption(
PSDevice pDevice,
unsigned char *pbyFrame,
@@ -162,7 +155,6 @@ s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,
PS802_11Header pMACHeader;
int ii;
-
pMACHeader = (PS802_11Header) (pbyRxBufferAddr + cbHeaderSize);
s_vGetDASA((unsigned char *)pMACHeader, &cbHeaderSize, &pDevice->sRxEthHeader);
@@ -223,9 +215,6 @@ s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr,
*pcbHeadSize = cbHeaderSize;
}
-
-
-
static unsigned char s_byGetRateIdx(unsigned char byRate)
{
unsigned char byRateIdx;
@@ -237,7 +226,6 @@ static unsigned char s_byGetRateIdx(unsigned char byRate)
return 0;
}
-
static void
s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
PSEthernetHeader psEthHeader)
@@ -279,9 +267,6 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
*pcbHeaderSize = cbHeaderSize;
}
-
-
-
//PLICE_DEBUG ->
void MngWorkItem(void *Context)
@@ -297,18 +282,14 @@ void MngWorkItem(void *Context)
spin_unlock_irq(&pDevice->lock);
}
-
//PLICE_DEBUG<-
-
-
bool
device_receive_frame(
PSDevice pDevice,
PSRxDesc pCurrRD
)
{
-
PDEVICE_RD_INFO pRDInfo = pCurrRD->pRDInfo;
struct net_device_stats *pStats = &pDevice->stats;
struct sk_buff *skb;
@@ -350,7 +331,6 @@ device_receive_frame(
skb = pRDInfo->skb;
-
//PLICE_DEBUG->
#if 1
pci_unmap_single(pDevice->pcid, pRDInfo->skb_dma,
@@ -436,7 +416,6 @@ device_receive_frame(
}
}
-
// Use for TKIP MIC
s_vGetDASA(skb->data+4, &cbHeaderSize, &pDevice->sRxEthHeader);
@@ -461,7 +440,6 @@ device_receive_frame(
}
}
-
if (IS_FC_WEP(pbyFrame)) {
bool bRxDecryOK = false;
@@ -509,7 +487,6 @@ device_receive_frame(
(pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) ||
(pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
(pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) {
-
if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_TKIP)) {
pDevice->s802_11Counter.TKIPICVErrors++;
} else if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_CCMP)) {
@@ -530,7 +507,6 @@ device_receive_frame(
FrameSize -= 4; // 4 is ICV
}
-
//
// RX OK
//
@@ -553,7 +529,6 @@ device_receive_frame(
}
}
-
// Management & Control frame Handle
if ((IS_TYPE_DATA((skb->data+4))) == false) {
// Handle Control & Manage Frame
@@ -665,10 +640,8 @@ device_receive_frame(
}
}
-
// Data frame Handle
-
if (pDevice->bEnablePSMode) {
if (IS_FC_MOREDATA((skb->data+4))) {
if (*pbyRsr & RSR_ADDROK) {
@@ -688,7 +661,6 @@ device_receive_frame(
BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0);
}
-
if (pDevice->byLocalID != REV_ID_VT3253_B1) {
pDevice->uCurrRSSI = *pbyRSSI;
}
@@ -747,7 +719,6 @@ device_receive_frame(
return false;
}
-
if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_TKIP)) {
if (bIsWEP) {
FrameSize -= 8; //MIC
@@ -766,7 +737,6 @@ device_receive_frame(
unsigned long dwLocalMIC_R = 0;
viawget_wpa_header *wpahdr;
-
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
dwMICKey0 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[24]));
dwMICKey1 = cpu_to_le32(*(unsigned long *)(&pKey->abyKey[28]));
@@ -799,7 +769,6 @@ device_receive_frame(
//DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R));
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1);
-
if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) || (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) ||
(pDevice->bRxMICFail == true)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MIC comparison is fail!\n");
@@ -838,7 +807,6 @@ device_receive_frame(
}
#endif
-
if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
wpahdr = (viawget_wpa_header *)pDevice->skb->data;
if ((pDevice->pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
@@ -912,13 +880,10 @@ device_receive_frame(
}
} // ----- End of Reply Counter Check --------------------------
-
-
if ((pKey != NULL) && (bIsWEP)) {
// pDevice->s802_11Counter.DecryptSuccessCount.QuadPart++;
}
-
s_vProcessRxMACHeader(pDevice, (unsigned char *)(skb->data+4), FrameSize, bIsWEP, bExtIV, &cbHeaderOffset);
FrameSize -= cbHeaderOffset;
cbHeaderOffset += 4; // 4 is Rcv buffer header
@@ -935,7 +900,6 @@ device_receive_frame(
iSANodeIndex,
iDANodeIndex
) == false) {
-
if (bDeFragRx) {
if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "%s: can not alloc more frag bufs\n",
@@ -951,7 +915,6 @@ device_receive_frame(
skb_put(skb, FrameSize);
skb->protocol = eth_type_trans(skb, skb->dev);
-
//drop frame not met IEEE 802.3
/*
if (pDevice->flags & DEVICE_FLAGS_VAL_PKT_LEN) {
@@ -986,7 +949,6 @@ device_receive_frame(
return true;
}
-
static bool s_bAPModeRxCtl(
PSDevice pDevice,
unsigned char *pbyFrame,
@@ -997,12 +959,9 @@ static bool s_bAPModeRxCtl(
CMD_STATUS Status;
PSMgmtObject pMgmt = pDevice->pMgmt;
-
if (IS_CTL_PSPOLL(pbyFrame) || !IS_TYPE_CONTROL(pbyFrame)) {
-
p802_11Header = (PS802_11Header)(pbyFrame);
if (!IS_TYPE_MGMT(pbyFrame)) {
-
// Data & PS-Poll packet
// check frame class
if (iSANodeIndex > 0) {
@@ -1086,7 +1045,6 @@ static bool s_bAPModeRxCtl(
}
}
return false;
-
}
static bool s_bHandleRxEncryption(
@@ -1108,7 +1066,6 @@ static bool s_bHandleRxEncryption(
unsigned char byDecMode = KEY_CTL_WEP;
PSMgmtObject pMgmt = pDevice->pMgmt;
-
*pwRxTSC15_0 = 0;
*pdwRxTSC47_16 = 0;
@@ -1234,7 +1191,6 @@ static bool s_bHandleRxEncryption(
return true;
}
-
static bool s_bHostWepRxEncryption(
PSDevice pDevice,
unsigned char *pbyFrame,
@@ -1254,8 +1210,6 @@ static bool s_bHostWepRxEncryption(
unsigned char byDecMode = KEY_CTL_WEP;
PS802_11Header pMACHeader;
-
-
*pwRxTSC15_0 = 0;
*pdwRxTSC47_16 = 0;
@@ -1269,7 +1223,6 @@ static bool s_bHostWepRxEncryption(
byKeyIdx >>= 6;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "\nKeyIdx: %d\n", byKeyIdx);
-
if (pDevice->pMgmt->byCSSGK == KEY_CTL_TKIP)
byDecMode = KEY_CTL_TKIP;
else if (pDevice->pMgmt->byCSSGK == KEY_CTL_CCMP)
@@ -1323,7 +1276,6 @@ static bool s_bHostWepRxEncryption(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "TSC0_15: %x\n", *pwRxTSC15_0);
if (byDecMode == KEY_CTL_TKIP) {
-
if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == false)) {
// Software TKIP
// 1. 3253 A
@@ -1364,8 +1316,6 @@ static bool s_bHostWepRxEncryption(
return true;
}
-
-
static bool s_bAPModeRxData(
PSDevice pDevice,
struct sk_buff *skb,
@@ -1381,7 +1331,6 @@ static bool s_bAPModeRxData(
unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
unsigned short wAID;
-
struct sk_buff *skbcpy = NULL;
if (FrameSize > CB_MAX_BUF_SIZE)
@@ -1389,7 +1338,6 @@ static bool s_bAPModeRxData(
// check DA
if (is_multicast_ether_addr((unsigned char *)(skb->data+cbHeaderOffset))) {
if (pMgmt->sNodeDBTable[0].bPSEnable) {
-
skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz);
// if any node in PS mode, buffer packet until DTIM.
@@ -1450,4 +1398,3 @@ static bool s_bAPModeRxData(
return true;
}
-
OpenPOWER on IntegriCloud