Skip to content

L
linux
Commit 429a2474 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: rxtx.c change BBvCalculateParameter to function vnt_get_phy_field 

Removing wLen and pointing to correct member.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 10c17445
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 86 deletions
drivers/staging/vt6655/rxtx.c
View file @ 429a2474
...@@ -673,7 +673,6 @@ s_uFillDataHead( ...@@ -673,7 +673,6 @@ s_uFillDataHead(
unsigned short wCurrentRate unsigned short wCurrentRate
) )
{ {
unsigned short wLen = 0x0000;
if (pTxDataHead == NULL) if (pTxDataHead == NULL)
return 0; return 0;
...@@ -682,15 +681,14 @@ s_uFillDataHead( ...@@ -682,15 +681,14 @@ s_uFillDataHead(
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
if (byFBOption == AUTO_FB_NONE) { if (byFBOption == AUTO_FB_NONE) {
PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead; PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, vnt_get_phy_field(pDevice, cbFrameLength, wCurrentRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a) byPktType, &pBuf->a);
);
pBuf->wTransmitLength_a = cpu_to_le16(wLen); vnt_get_phy_field(pDevice, cbFrameLength,
BBvCalculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B, pDevice->byTopCCKBasicRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b) PK_TYPE_11B, &pBuf->b);
);
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
//Get Duration and TimeStamp //Get Duration and TimeStamp
pBuf->wDuration_a = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, pBuf->wDuration_a = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength,
byPktType, wCurrentRate, bNeedAck, uFragIdx, byPktType, wCurrentRate, bNeedAck, uFragIdx,
...@@ -708,15 +706,13 @@ s_uFillDataHead( ...@@ -708,15 +706,13 @@ s_uFillDataHead(
} else { } else {
// Auto Fallback // Auto Fallback
PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead; PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, vnt_get_phy_field(pDevice, cbFrameLength, wCurrentRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a) byPktType, &pBuf->a);
);
pBuf->wTransmitLength_a = cpu_to_le16(wLen); vnt_get_phy_field(pDevice, cbFrameLength,
BBvCalculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B, pDevice->byTopCCKBasicRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b) PK_TYPE_11B, &pBuf->b);
);
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
//Get Duration and TimeStamp //Get Duration and TimeStamp
pBuf->wDuration_a = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, pBuf->wDuration_a = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz
...@@ -736,11 +732,10 @@ s_uFillDataHead( ...@@ -736,11 +732,10 @@ s_uFillDataHead(
if ((byFBOption != AUTO_FB_NONE)) { if ((byFBOption != AUTO_FB_NONE)) {
// Auto Fallback // Auto Fallback
PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead; PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, vnt_get_phy_field(pDevice, cbFrameLength, wCurrentRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField) byPktType, &pBuf->a);
);
pBuf->wTransmitLength = cpu_to_le16(wLen);
//Get Duration and TimeStampOff //Get Duration and TimeStampOff
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
...@@ -753,11 +748,9 @@ s_uFillDataHead( ...@@ -753,11 +748,9 @@ s_uFillDataHead(
return pBuf->wDuration; return pBuf->wDuration;
} else { } else {
PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, vnt_get_phy_field(pDevice, cbFrameLength, wCurrentRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField) byPktType, &pBuf->ab);
);
pBuf->wTransmitLength = cpu_to_le16(wLen);
//Get Duration and TimeStampOff //Get Duration and TimeStampOff
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
...@@ -770,11 +763,9 @@ s_uFillDataHead( ...@@ -770,11 +763,9 @@ s_uFillDataHead(
} }
} else { } else {
PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, vnt_get_phy_field(pDevice, cbFrameLength, wCurrentRate,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField) byPktType, &pBuf->ab);
);
pBuf->wTransmitLength = cpu_to_le16(wLen);
//Get Duration and TimeStampOff //Get Duration and TimeStampOff
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType, pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType,
wCurrentRate, bNeedAck, uFragIdx, wCurrentRate, bNeedAck, uFragIdx,
...@@ -801,7 +792,6 @@ s_vFillRTSHead( ...@@ -801,7 +792,6 @@ s_vFillRTSHead(
) )
{ {
unsigned int uRTSFrameLen = 20; unsigned int uRTSFrameLen = 20;
unsigned short wLen = 0x0000;
if (pvRTS == NULL) if (pvRTS == NULL)
return; return;
...@@ -817,15 +807,14 @@ s_vFillRTSHead( ...@@ -817,15 +807,14 @@ s_vFillRTSHead(
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
if (byFBOption == AUTO_FB_NONE) { if (byFBOption == AUTO_FB_NONE) {
PSRTS_g pBuf = (PSRTS_g)pvRTS; PSRTS_g pBuf = (PSRTS_g)pvRTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b) pDevice->byTopCCKBasicRate,
); PK_TYPE_11B, &pBuf->b);
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a) pDevice->byTopOFDMBasicRate,
); byPktType, &pBuf->a);
pBuf->wTransmitLength_a = cpu_to_le16(wLen);
//Get Duration //Get Duration
pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData
...@@ -847,16 +836,14 @@ s_vFillRTSHead( ...@@ -847,16 +836,14 @@ s_vFillRTSHead(
} else { } else {
PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS; PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b) pDevice->byTopCCKBasicRate,
); PK_TYPE_11B, &pBuf->b);
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_a), (unsigned char *)&(pBuf->bySignalField_a) pDevice->byTopOFDMBasicRate,
); byPktType, &pBuf->a);
pBuf->wTransmitLength_a = cpu_to_le16(wLen);
//Get Duration //Get Duration
pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3:2.4G OFDMData pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3:2.4G OFDMData
...@@ -885,11 +872,10 @@ s_vFillRTSHead( ...@@ -885,11 +872,10 @@ s_vFillRTSHead(
} else if (byPktType == PK_TYPE_11A) { } else if (byPktType == PK_TYPE_11A) {
if (byFBOption == AUTO_FB_NONE) { if (byFBOption == AUTO_FB_NONE) {
PSRTS_ab pBuf = (PSRTS_ab)pvRTS; PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField) pDevice->byTopOFDMBasicRate,
); byPktType, &pBuf->ab);
pBuf->wTransmitLength = cpu_to_le16(wLen);
//Get Duration //Get Duration
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData
pBuf->Data.wDurationID = pBuf->wDuration; pBuf->Data.wDurationID = pBuf->wDuration;
...@@ -910,11 +896,10 @@ s_vFillRTSHead( ...@@ -910,11 +896,10 @@ s_vFillRTSHead(
} else { } else {
PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS; PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField) pDevice->byTopOFDMBasicRate,
); byPktType, &pBuf->a);
pBuf->wTransmitLength = cpu_to_le16(wLen);
//Get Duration //Get Duration
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData
pBuf->wRTSDuration_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData pBuf->wRTSDuration_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData
...@@ -936,11 +921,10 @@ s_vFillRTSHead( ...@@ -936,11 +921,10 @@ s_vFillRTSHead(
} }
} else if (byPktType == PK_TYPE_11B) { } else if (byPktType == PK_TYPE_11B) {
PSRTS_ab pBuf = (PSRTS_ab)pvRTS; PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, vnt_get_phy_field(pDevice, uRTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField), (unsigned char *)&(pBuf->bySignalField) pDevice->byTopCCKBasicRate,
); PK_TYPE_11B, &pBuf->ab);
pBuf->wTransmitLength = cpu_to_le16(wLen);
//Get Duration //Get Duration
pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
pBuf->Data.wDurationID = pBuf->wDuration; pBuf->Data.wDurationID = pBuf->wDuration;
...@@ -976,7 +960,6 @@ s_vFillCTSHead( ...@@ -976,7 +960,6 @@ s_vFillCTSHead(
) )
{ {
unsigned int uCTSFrameLen = 14; unsigned int uCTSFrameLen = 14;
unsigned short wLen = 0x0000;
if (pvCTS == NULL) if (pvCTS == NULL)
return; return;
...@@ -991,12 +974,10 @@ s_vFillCTSHead( ...@@ -991,12 +974,10 @@ s_vFillCTSHead(
if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
// Auto Fall back // Auto Fall back
PSCTS_FB pBuf = (PSCTS_FB)pvCTS; PSCTS_FB pBuf = (PSCTS_FB)pvCTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, vnt_get_phy_field(pDevice, uCTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b) pDevice->byTopCCKBasicRate,
); PK_TYPE_11B, &pBuf->b);
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
pBuf->wDuration_ba = (unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wDuration_ba = (unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
pBuf->wDuration_ba += pDevice->wCTSDuration; pBuf->wDuration_ba += pDevice->wCTSDuration;
...@@ -1017,11 +998,11 @@ s_vFillCTSHead( ...@@ -1017,11 +998,11 @@ s_vFillCTSHead(
} else { //if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) } else { //if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA)
PSCTS pBuf = (PSCTS)pvCTS; PSCTS pBuf = (PSCTS)pvCTS;
//Get SignalField,ServiceField,Length /* Get SignalField, ServiceField & Length */
BBvCalculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, vnt_get_phy_field(pDevice, uCTSFrameLen,
(unsigned short *)&(wLen), (unsigned char *)&(pBuf->byServiceField_b), (unsigned char *)&(pBuf->bySignalField_b) pDevice->byTopCCKBasicRate,
); PK_TYPE_11B, &pBuf->b);
pBuf->wTransmitLength_b = cpu_to_le16(wLen);
//Get CTSDuration_ba //Get CTSDuration_ba
pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
pBuf->wDuration_ba += pDevice->wCTSDuration; pBuf->wDuration_ba += pDevice->wCTSDuration;
...@@ -2358,7 +2339,6 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket) ...@@ -2358,7 +2339,6 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket)
PSTxDataHead_ab pTxDataHead = (PSTxDataHead_ab) (pbyBuffer + wTxBufSize); PSTxDataHead_ab pTxDataHead = (PSTxDataHead_ab) (pbyBuffer + wTxBufSize);
PS802_11Header pMACHeader; PS802_11Header pMACHeader;
unsigned short wCurrentRate; unsigned short wCurrentRate;
unsigned short wLen = 0x0000;
memset(pTxBufHead, 0, wTxBufSize); memset(pTxBufHead, 0, wTxBufSize);
...@@ -2387,10 +2367,9 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket) ...@@ -2387,10 +2367,9 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket)
wCurrentRate, false, 0, 0, 1, AUTO_FB_NONE)); wCurrentRate, false, 0, 0, 1, AUTO_FB_NONE));
} }
BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, byPktType, vnt_get_phy_field(pDevice, cbFrameSize,
(unsigned short *)&(wLen), (unsigned char *)&(pTxDataHead->byServiceField), (unsigned char *)&(pTxDataHead->bySignalField) wCurrentRate, byPktType, &pTxDataHead->ab);
);
pTxDataHead->wTransmitLength = cpu_to_le16(wLen);
//Get TimeStampOff //Get TimeStampOff
pTxDataHead->wTimeStampOff = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]); pTxDataHead->wTimeStampOff = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]);
cbHeaderSize = wTxBufSize + sizeof(STxDataHead_ab); cbHeaderSize = wTxBufSize + sizeof(STxDataHead_ab);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7