mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
staging: vt6656: rxtx.c cleanup s_vGenerateTxParameter
Remove white space and commented out code. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley
Greg Kroah-Hartman
parent
cd94d281e9
commit
92928f1318
1 changed files with 116 additions and 108 deletions
|
|
@ -835,140 +835,148 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
u16 wFifoCtl;
|
||||
u8 byFBOption = AUTO_FB_NONE;
|
||||
|
||||
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter...\n");
|
||||
pFifoHead->wReserved = wCurrentRate;
|
||||
wFifoCtl = pFifoHead->wFIFOCtl;
|
||||
pFifoHead->wReserved = wCurrentRate;
|
||||
wFifoCtl = pFifoHead->wFIFOCtl;
|
||||
|
||||
if (wFifoCtl & FIFOCTL_AUTO_FB_0) {
|
||||
byFBOption = AUTO_FB_0;
|
||||
}
|
||||
else if (wFifoCtl & FIFOCTL_AUTO_FB_1) {
|
||||
byFBOption = AUTO_FB_1;
|
||||
}
|
||||
if (wFifoCtl & FIFOCTL_AUTO_FB_0)
|
||||
byFBOption = AUTO_FB_0;
|
||||
else if (wFifoCtl & FIFOCTL_AUTO_FB_1)
|
||||
byFBOption = AUTO_FB_1;
|
||||
|
||||
if (!pFifoHead)
|
||||
return 0;
|
||||
|
||||
if (pDevice->bLongHeader)
|
||||
cbMACHdLen = WLAN_HDR_ADDR3_LEN + 6;
|
||||
if (pDevice->bLongHeader)
|
||||
cbMACHdLen = WLAN_HDR_ADDR3_LEN + 6;
|
||||
|
||||
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
|
||||
if (need_rts) {
|
||||
//Fill RsvTime
|
||||
struct vnt_rrv_time_rts *pBuf = &tx_buffer->tx_head.tx_rts.rts;
|
||||
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
|
||||
if (need_rts) {
|
||||
struct vnt_rrv_time_rts *pBuf =
|
||||
&tx_buffer->tx_head.tx_rts.rts;
|
||||
|
||||
pBuf->wRTSTxRrvTime_aa = s_uGetRTSCTSRsvTime(pDevice, 2,
|
||||
pBuf->wRTSTxRrvTime_aa = s_uGetRTSCTSRsvTime(pDevice, 2,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wRTSTxRrvTime_ba = s_uGetRTSCTSRsvTime(pDevice, 1,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wRTSTxRrvTime_bb = s_uGetRTSCTSRsvTime(pDevice, 0,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wRTSTxRrvTime_ba = s_uGetRTSCTSRsvTime(pDevice, 1,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wRTSTxRrvTime_bb = s_uGetRTSCTSRsvTime(pDevice, 0,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
byPktType, cbFrameSize, wCurrentRate, bNeedACK);
|
||||
pBuf->wTxRrvTime_b = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate,
|
||||
bNeedACK);
|
||||
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->tx_head.tx_rts.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_rts.tx.mic.head;
|
||||
pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
byPktType, cbFrameSize, wCurrentRate, bNeedACK);
|
||||
pBuf->wTxRrvTime_b = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11B, cbFrameSize,
|
||||
pDevice->byTopCCKBasicRate, bNeedACK);
|
||||
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->
|
||||
tx_head.tx_rts.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_rts.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_rts.tx.head;
|
||||
}
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(pDevice, byPktType, head,
|
||||
cbFrameSize, bNeedACK, psEthHeader,
|
||||
wCurrentRate, byFBOption);
|
||||
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_rts.tx.head;
|
||||
struct vnt_rrv_time_cts *pBuf = &tx_buffer->
|
||||
tx_head.tx_cts.cts;
|
||||
|
||||
pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
byPktType, cbFrameSize, wCurrentRate, bNeedACK);
|
||||
pBuf->wTxRrvTime_b = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11B, cbFrameSize,
|
||||
pDevice->byTopCCKBasicRate, bNeedACK);
|
||||
|
||||
pBuf->wCTSTxRrvTime_ba = s_uGetRTSCTSRsvTime(pDevice, 3,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->
|
||||
tx_head.tx_cts.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_cts.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_cts.tx.head;
|
||||
}
|
||||
|
||||
/* Fill CTS */
|
||||
return s_vFillCTSHead(pDevice, uDMAIdx, byPktType,
|
||||
head, cbFrameSize, bNeedACK, wCurrentRate,
|
||||
byFBOption);
|
||||
}
|
||||
} else if (byPktType == PK_TYPE_11A) {
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.head;
|
||||
}
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(pDevice, byPktType, head, cbFrameSize,
|
||||
bNeedACK, psEthHeader, wCurrentRate, byFBOption);
|
||||
}
|
||||
else {//RTS_needless, PCF mode
|
||||
//Fill RsvTime
|
||||
struct vnt_rrv_time_cts *pBuf = &tx_buffer->tx_head.tx_cts.cts;
|
||||
if (need_rts) {
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
|
||||
tx_head.tx_ab.ab;
|
||||
|
||||
pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
pBuf->wTxRrvTime_b = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11B, cbFrameSize,
|
||||
pDevice->byTopCCKBasicRate, bNeedACK);
|
||||
pBuf->wCTSTxRrvTime_ba = s_uGetRTSCTSRsvTime(pDevice, 3,
|
||||
pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 2,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->tx_head.tx_cts.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_cts.tx.mic.head;
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
byPktType, cbFrameSize, wCurrentRate, bNeedACK);
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(pDevice, byPktType, head,
|
||||
cbFrameSize, bNeedACK, psEthHeader,
|
||||
wCurrentRate, byFBOption);
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_cts.tx.head;
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
|
||||
tx_head.tx_ab.ab;
|
||||
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11A, cbFrameSize,
|
||||
wCurrentRate, bNeedACK);
|
||||
|
||||
return vnt_rxtx_datahead_a_fb(pDevice, byPktType,
|
||||
wCurrentRate, &head->data_head_a_fb,
|
||||
cbFrameSize, bNeedACK);
|
||||
}
|
||||
} else if (byPktType == PK_TYPE_11B) {
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.head;
|
||||
}
|
||||
|
||||
/* Fill CTS */
|
||||
return s_vFillCTSHead(pDevice, uDMAIdx, byPktType, head,
|
||||
cbFrameSize, bNeedACK, wCurrentRate, byFBOption);
|
||||
}
|
||||
}
|
||||
else if (byPktType == PK_TYPE_11A) {
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.head;
|
||||
}
|
||||
if (need_rts) {
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
|
||||
tx_head.tx_ab.ab;
|
||||
|
||||
if (need_rts) {
|
||||
//Fill RsvTime
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.tx_ab.ab;
|
||||
|
||||
pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 2,
|
||||
pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 0,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, byPktType,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(pDevice, byPktType, head, cbFrameSize,
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11B, cbFrameSize, wCurrentRate,
|
||||
bNeedACK);
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(pDevice, byPktType, head,
|
||||
cbFrameSize,
|
||||
bNeedACK, psEthHeader, wCurrentRate, byFBOption);
|
||||
} else {
|
||||
//Fill RsvTime
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.tx_ab.ab;
|
||||
} else {
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->
|
||||
tx_head.tx_ab.ab;
|
||||
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,
|
||||
PK_TYPE_11B, cbFrameSize,
|
||||
wCurrentRate, bNeedACK);
|
||||
|
||||
return vnt_rxtx_datahead_a_fb(pDevice, byPktType, wCurrentRate,
|
||||
&head->data_head_a_fb, cbFrameSize, bNeedACK);
|
||||
}
|
||||
}
|
||||
else if (byPktType == PK_TYPE_11B) {
|
||||
if (need_mic) {
|
||||
*mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr;
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.mic.head;
|
||||
} else {
|
||||
head = &tx_buffer->tx_head.tx_ab.tx.head;
|
||||
return vnt_rxtx_datahead_ab(pDevice, byPktType,
|
||||
wCurrentRate, &head->data_head_ab,
|
||||
cbFrameSize, bNeedACK);
|
||||
}
|
||||
}
|
||||
|
||||
if (need_rts) {
|
||||
//Fill RsvTime
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.tx_ab.ab;
|
||||
|
||||
pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 0,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
|
||||
/* Fill RTS */
|
||||
return s_vFillRTSHead(pDevice, byPktType, head, cbFrameSize,
|
||||
bNeedACK, psEthHeader, wCurrentRate, byFBOption);
|
||||
}
|
||||
else { //RTS_needless, non PCF mode
|
||||
//Fill RsvTime
|
||||
struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.tx_ab.ab;
|
||||
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
|
||||
return vnt_rxtx_datahead_ab(pDevice, byPktType, wCurrentRate,
|
||||
&head->data_head_ab, cbFrameSize, bNeedACK);
|
||||
}
|
||||
}
|
||||
//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter END.\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue