summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/dpc.c
diff options
context:
space:
mode:
authorAndres More <more.andres@gmail.com>2013-03-26 18:18:30 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 16:06:27 -0700
commit9fbafdd9add10e349deeb1f38290943d5107e276 (patch)
tree54ad92d792967727d0ca7f37579a3ecf4c313d96 /drivers/staging/vt6656/dpc.c
parent1cedfa317eb15a82b4e44ed868f4e451238d5aea (diff)
downloadop-kernel-dev-9fbafdd9add10e349deeb1f38290943d5107e276.zip
op-kernel-dev-9fbafdd9add10e349deeb1f38290943d5107e276.tar.gz
staging: vt6656: remove consecutive newlines
Several sed -i '/^$/{ N /^\n$/ D }' drivers/staging/vt6656/*.[ch] Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
-rw-r--r--drivers/staging/vt6656/dpc.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 675b609..7ec166a 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -56,18 +56,12 @@
#include "datarate.h"
#include "usbpipe.h"
-
-
//static int msglevel =MSG_LEVEL_DEBUG;
static int msglevel =MSG_LEVEL_INFO;
const u8 acbyRxRate[MAX_RATE] =
{2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108};
-
-
-
-
static u8 s_byGetRateIdx(u8 byRate);
static
@@ -96,7 +90,6 @@ static int s_bHostWepRxEncryption(struct vnt_private *pDevice, u8 *pbyFrame,
u32 FrameSize, u8 *pbyRsr, int bOnFly, PSKeyItem pKey, u8 *pbyNewRsr,
s32 *pbExtIV, u16 *pwRxTSC15_0, u32 *pdwRxTSC47_16);
-
/*+
*
* Description:
@@ -125,7 +118,6 @@ static void s_vProcessRxMACHeader(struct vnt_private *pDevice,
struct ieee80211_hdr *pMACHeader;
int ii;
-
pMACHeader = (struct ieee80211_hdr *) (pbyRxBufferAddr + cbHeaderSize);
s_vGetDASA((u8 *)pMACHeader, &cbHeaderSize, &pDevice->sRxEthHeader);
@@ -190,9 +182,6 @@ static void s_vProcessRxMACHeader(struct vnt_private *pDevice,
*pcbHeadSize = cbHeaderSize;
}
-
-
-
static u8 s_byGetRateIdx(u8 byRate)
{
u8 byRateIdx;
@@ -204,7 +193,6 @@ static u8 s_byGetRateIdx(u8 byRate)
return 0;
}
-
static
void
s_vGetDASA (
@@ -258,7 +246,6 @@ s_vGetDASA (
*pcbHeaderSize = cbHeaderSize;
}
-
int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
unsigned long BytesToIndicate)
{
@@ -293,7 +280,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
struct ieee80211_hdr *pMACHeader;
int bRxeapol_key = false;
-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- RXbBulkInProcessData---\n");
skb = pRCB->skb;
@@ -370,7 +356,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
FrameSize
);
-
pMACHeader = (struct ieee80211_hdr *) pbyFrame;
//mike add: to judge if current AP is activated?
@@ -396,7 +381,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
}
}
-
// Use for TKIP MIC
s_vGetDASA(pbyFrame, &cbHeaderSize, &pDevice->sRxEthHeader);
@@ -421,7 +405,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
}
}
-
if (IS_FC_WEP(pbyFrame)) {
bool bRxDecryOK = false;
@@ -490,7 +473,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
FrameSize -= 4; // 4 is ICV
}
-
//
// RX OK
//
@@ -646,10 +628,8 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
}
}
-
// Data frame Handle
-
if (pDevice->bEnablePSMode) {
if (IS_FC_MOREDATA((pbyFrame))) {
if (*pbyRsr & RSR_ADDROK) {
@@ -692,7 +672,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
}
*/
-
// -----------------------------------------------
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnable8021x == true)){
@@ -732,7 +711,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
return false;
}
-
if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_TKIP)) {
if (bIsWEP) {
FrameSize -= 8; //MIC
@@ -750,7 +728,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
u32 dwLocalMIC_L = 0;
u32 dwLocalMIC_R = 0;
-
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
dwMICKey0 = cpu_to_le32(*(u32 *)(&pKey->abyKey[24]));
dwMICKey1 = cpu_to_le32(*(u32 *)(&pKey->abyKey[28]));
@@ -781,7 +758,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
pdwMIC_L = (u32 *)(skb->data + 8 + FrameSize);
pdwMIC_R = (u32 *)(skb->data + 8 + FrameSize + 4);
-
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");
@@ -869,7 +845,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB,
}
} // ----- End of Reply Counter Check --------------------------
-
s_vProcessRxMACHeader(pDevice, (u8 *)(skb->data+8), FrameSize, bIsWEP, bExtIV, &cbHeaderOffset);
FrameSize -= cbHeaderOffset;
cbHeaderOffset += 8; // 8 is Rcv buffer header
@@ -924,7 +899,6 @@ static int s_bAPModeRxCtl(struct vnt_private *pDevice, u8 *pbyFrame,
struct ieee80211_hdr *p802_11Header;
CMD_STATUS Status;
-
if (IS_CTL_PSPOLL(pbyFrame) || !IS_TYPE_CONTROL(pbyFrame)) {
p802_11Header = (struct ieee80211_hdr *) (pbyFrame);
@@ -1035,7 +1009,6 @@ static int s_bHandleRxEncryption(struct vnt_private *pDevice, u8 *pbyFrame,
PSKeyItem pKey = NULL;
u8 byDecMode = KEY_CTL_WEP;
-
*pwRxTSC15_0 = 0;
*pdwRxTSC47_16 = 0;
@@ -1185,7 +1158,6 @@ static int s_bHostWepRxEncryption(struct vnt_private *pDevice, u8 *pbyFrame,
byKeyIdx >>= 6;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\nKeyIdx: %d\n", byKeyIdx);
-
if (pMgmt->byCSSGK == KEY_CTL_TKIP)
byDecMode = KEY_CTL_TKIP;
else if (pMgmt->byCSSGK == KEY_CTL_CCMP)
@@ -1290,7 +1262,6 @@ static int s_bAPModeRxData(struct vnt_private *pDevice, struct sk_buff *skb,
u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
u16 wAID;
-
if (FrameSize > CB_MAX_BUF_SIZE)
return false;
// check DA
@@ -1363,9 +1334,6 @@ static int s_bAPModeRxData(struct vnt_private *pDevice, struct sk_buff *skb,
return true;
}
-
-
-
void RXvWorkItem(struct vnt_private *pDevice)
{
int ntStatus;
@@ -1388,12 +1356,10 @@ void RXvWorkItem(struct vnt_private *pDevice)
}
-
void RXvFreeRCB(PRCB pRCB, int bReAllocSkb)
{
struct vnt_private *pDevice = pRCB->pDevice;
-
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->RXvFreeRCB\n");
ASSERT(!pRCB->Ref); // should be 0
@@ -1419,7 +1385,6 @@ void RXvFreeRCB(PRCB pRCB, int bReAllocSkb)
EnqueueRCB(pDevice->FirstRecvFreeList, pDevice->LastRecvFreeList, pRCB);
pDevice->NumRecvFreeList++;
-
if ((pDevice->Flags & fMP_POST_READS) && MP_IS_READY(pDevice) &&
(pDevice->bIsRxWorkItemQueued == false) ) {
@@ -1429,7 +1394,6 @@ void RXvFreeRCB(PRCB pRCB, int bReAllocSkb)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"<----RXFreeRCB %d %d\n",pDevice->NumRecvFreeList, pDevice->NumRecvMngList);
}
-
void RXvMngWorkItem(struct vnt_private *pDevice)
{
PRCB pRCB = NULL;
@@ -1464,4 +1428,3 @@ void RXvMngWorkItem(struct vnt_private *pDevice)
}
-
OpenPOWER on IntegriCloud