Commit 180071a1 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging:vt6655:wroute: Whitespace cleanups

Neatening only.
git diff -w shows no differences.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9cf92bf
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
/*--------------------- Static Classes ----------------------------*/ /*--------------------- Static Classes ----------------------------*/
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
static int msglevel =MSG_LEVEL_INFO; static int msglevel = MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
...@@ -65,7 +65,7 @@ static int msglevel =MSG_LEVEL_INFO; ...@@ -65,7 +65,7 @@ static int msglevel =MSG_LEVEL_INFO;
* Return Value: true if packet duplicate; otherwise false * Return Value: true if packet duplicate; otherwise false
* *
*/ */
bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex) bool ROUTEbRelay(PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex)
{ {
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD; PSTxDesc pHeadTD, pLastTD;
...@@ -82,14 +82,14 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat ...@@ -82,14 +82,14 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat
if (AVAIL_TD(pDevice, TYPE_AC0DMA)<=0) { if (AVAIL_TD(pDevice, TYPE_AC0DMA) <= 0) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Relay can't allocate TD1..\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Relay can't allocate TD1..\n");
return false; return false;
} }
pHeadTD = pDevice->apCurrTD[TYPE_AC0DMA]; pHeadTD = pDevice->apCurrTD[TYPE_AC0DMA];
pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP); pHeadTD->m_td1TD1.byTCR = (TCR_EDP | TCR_STP);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (unsigned char *)pbySkbData, ETH_HLEN); memcpy(pDevice->sTxEthHeader.abyDstAddr, (unsigned char *)pbySkbData, ETH_HLEN);
...@@ -104,11 +104,11 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat ...@@ -104,11 +104,11 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat
// get group key // get group key
pbyBSSID = pDevice->abyBroadcastAddr; pbyBSSID = pDevice->abyBroadcastAddr;
if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == false) { if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == false) {
pTransmitKey = NULL; pTransmitKey = NULL;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode); DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG "KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode);
} else { } else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG "Get GTK.\n");
} }
} }
...@@ -123,13 +123,13 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat ...@@ -123,13 +123,13 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat
memcpy(pTransmitKey->abyKey, memcpy(pTransmitKey->abyKey,
&pMgmt->sNodeDBTable[uNodeIndex].abyWepKey[0], &pMgmt->sNodeDBTable[uNodeIndex].abyWepKey[0],
pTransmitKey->uKeyLength pTransmitKey->uKeyLength
); );
} }
} }
uMACfragNum = cbGetFragCount(pDevice, pTransmitKey, cbFrameBodySize, &pDevice->sTxEthHeader); uMACfragNum = cbGetFragCount(pDevice, pTransmitKey, cbFrameBodySize, &pDevice->sTxEthHeader);
if (uMACfragNum > AVAIL_TD(pDevice,TYPE_AC0DMA)) { if (uMACfragNum > AVAIL_TD(pDevice, TYPE_AC0DMA)) {
return false; return false;
} }
byPktType = (unsigned char)pDevice->byPacketType; byPktType = (unsigned char)pDevice->byPacketType;
...@@ -165,7 +165,7 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat ...@@ -165,7 +165,7 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat
&pDevice->sTxEthHeader, pbySkbData, pTransmitKey, uNodeIndex, &pDevice->sTxEthHeader, pbySkbData, pTransmitKey, uNodeIndex,
&uMACfragNum, &uMACfragNum,
&cbHeaderSize &cbHeaderSize
); );
if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS)) { if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS)) {
// Disable PS // Disable PS
...@@ -178,7 +178,7 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat ...@@ -178,7 +178,7 @@ bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat
for (ii = 0; ii < uMACfragNum; ii++) { for (ii = 0; ii < uMACfragNum; ii++) {
// Poll Transmit the adapter // Poll Transmit the adapter
wmb(); wmb();
pHeadTD->m_td0TD0.f1Owner=OWNED_BY_NIC; pHeadTD->m_td0TD0.f1Owner = OWNED_BY_NIC;
wmb(); wmb();
if (ii == (uMACfragNum - 1)) if (ii == (uMACfragNum - 1))
pLastTD = pHeadTD; pLastTD = pHeadTD;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
/*--------------------- Export Functions --------------------------*/ /*--------------------- Export Functions --------------------------*/
bool ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex); bool ROUTEbRelay(PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex);
#endif // __WROUTE_H__ #endif // __WROUTE_H__
......
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