staging: vt6656: desc.h: Move typedef struct tagSRrvTime_gCTS to new structure in rxtx.h
To new structure. typedef struct tagSRrvTime_gCTS -> struct vnt_rrv_time_cts This is only needed by rxtc.c so moved to rxtx.h and will eventually form part of the structure of struct vnt_tx_buffer. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6398a59bec
commit
4f990057bc
|
@ -146,16 +146,6 @@
|
||||||
/*
|
/*
|
||||||
* RsvTime buffer header
|
* RsvTime buffer header
|
||||||
*/
|
*/
|
||||||
typedef struct tagSRrvTime_gCTS {
|
|
||||||
u16 wCTSTxRrvTime_ba;
|
|
||||||
u16 wReserved;
|
|
||||||
u16 wTxRrvTime_b;
|
|
||||||
u16 wTxRrvTime_a;
|
|
||||||
} __attribute__ ((__packed__))
|
|
||||||
SRrvTime_gCTS, *PSRrvTime_gCTS;
|
|
||||||
|
|
||||||
typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;
|
|
||||||
|
|
||||||
typedef struct tagSRrvTime_ab {
|
typedef struct tagSRrvTime_ab {
|
||||||
u16 wRTSTxRrvTime;
|
u16 wRTSTxRrvTime;
|
||||||
u16 wTxRrvTime;
|
u16 wTxRrvTime;
|
||||||
|
|
|
@ -934,7 +934,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
||||||
|
|
||||||
//Fill RsvTime
|
//Fill RsvTime
|
||||||
if (pvRrvTime) {
|
if (pvRrvTime) {
|
||||||
PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime;
|
struct vnt_rrv_time_cts *pBuf =
|
||||||
|
(struct vnt_rrv_time_cts *)pvRrvTime;
|
||||||
pBuf->wTxRrvTime_a = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM
|
pBuf->wTxRrvTime_a = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM
|
||||||
pBuf->wTxRrvTime_b = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
|
pBuf->wTxRrvTime_b = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
|
||||||
pBuf->wCTSTxRrvTime_ba = cpu_to_le16((u16)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz
|
pBuf->wCTSTxRrvTime_ba = cpu_to_le16((u16)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz
|
||||||
|
@ -1165,16 +1166,19 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
||||||
sizeof(STxDataHead_g);
|
sizeof(STxDataHead_g);
|
||||||
}
|
}
|
||||||
else { //RTS_needless
|
else { //RTS_needless
|
||||||
pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
|
pvRrvTime = (struct vnt_rrv_time_cts *)
|
||||||
pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));
|
(pbyTxBufferAddr + wTxBufSize);
|
||||||
|
pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize +
|
||||||
|
sizeof(struct vnt_rrv_time_cts));
|
||||||
pvRTS = NULL;
|
pvRTS = NULL;
|
||||||
pvCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +
|
pvCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS) + cbMICHDR);
|
sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
|
||||||
pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
|
pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS) + cbMICHDR +
|
sizeof(struct vnt_rrv_time_cts) + cbMICHDR +
|
||||||
sizeof(struct vnt_cts));
|
sizeof(struct vnt_cts));
|
||||||
cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gCTS) + cbMICHDR +
|
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
|
||||||
sizeof(struct vnt_cts) + sizeof(STxDataHead_g);
|
cbMICHDR + sizeof(struct vnt_cts) +
|
||||||
|
sizeof(STxDataHead_g);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Auto Fall Back
|
// Auto Fall Back
|
||||||
|
@ -1194,15 +1198,17 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
|
||||||
sizeof(STxDataHead_g_FB);
|
sizeof(STxDataHead_g_FB);
|
||||||
}
|
}
|
||||||
else if (bRTS == false) { //RTS_needless
|
else if (bRTS == false) { //RTS_needless
|
||||||
pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
|
pvRrvTime = (struct vnt_rrv_time_cts *)
|
||||||
pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));
|
(pbyTxBufferAddr + wTxBufSize);
|
||||||
|
pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize +
|
||||||
|
sizeof(struct vnt_rrv_time_cts));
|
||||||
pvRTS = NULL;
|
pvRTS = NULL;
|
||||||
pvCTS = (struct vnt_cts_fb *) (pbyTxBufferAddr + wTxBufSize +
|
pvCTS = (struct vnt_cts_fb *) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS) + cbMICHDR);
|
sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
|
||||||
pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr +
|
pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr +
|
||||||
wTxBufSize + sizeof(SRrvTime_gCTS) + cbMICHDR +
|
wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
|
||||||
sizeof(struct vnt_cts_fb));
|
cbMICHDR + sizeof(struct vnt_cts_fb));
|
||||||
cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gCTS) +
|
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
|
||||||
cbMICHDR + sizeof(struct vnt_cts_fb) +
|
cbMICHDR + sizeof(struct vnt_cts_fb) +
|
||||||
sizeof(STxDataHead_g_FB);
|
sizeof(STxDataHead_g_FB);
|
||||||
}
|
}
|
||||||
|
@ -1659,14 +1665,14 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
|
||||||
//Set RrvTime/RTS/CTS Buffer
|
//Set RrvTime/RTS/CTS Buffer
|
||||||
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
|
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
|
||||||
|
|
||||||
pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
|
pvRrvTime = (struct vnt_rrv_time_cts *) (pbyTxBufferAddr + wTxBufSize);
|
||||||
pMICHDR = NULL;
|
pMICHDR = NULL;
|
||||||
pvRTS = NULL;
|
pvRTS = NULL;
|
||||||
pCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +
|
pCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS));
|
sizeof(struct vnt_rrv_time_cts));
|
||||||
pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
|
pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS) + sizeof(struct vnt_cts));
|
sizeof(struct vnt_rrv_time_cts) + sizeof(struct vnt_cts));
|
||||||
cbHeaderSize = wTxBufSize + sizeof(SRrvTime_gCTS) +
|
cbHeaderSize = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
|
||||||
sizeof(struct vnt_cts) + sizeof(STxDataHead_g);
|
sizeof(struct vnt_cts) + sizeof(STxDataHead_g);
|
||||||
}
|
}
|
||||||
else { // 802.11a/b packet
|
else { // 802.11a/b packet
|
||||||
|
@ -2061,15 +2067,16 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
|
||||||
//the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter()
|
//the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter()
|
||||||
|
|
||||||
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
|
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
|
||||||
|
pvRrvTime = (struct vnt_rrv_time_cts *) (pbyTxBufferAddr + wTxBufSize);
|
||||||
pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
|
pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize +
|
||||||
pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));
|
sizeof(struct vnt_rrv_time_cts));
|
||||||
pvRTS = NULL;
|
pvRTS = NULL;
|
||||||
pvCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +
|
pvCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS) + cbMICHDR);
|
sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
|
||||||
pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
|
pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
|
||||||
sizeof(SRrvTime_gCTS) + cbMICHDR + sizeof(struct vnt_cts));
|
sizeof(struct vnt_rrv_time_cts) + cbMICHDR +
|
||||||
cbHeaderSize = wTxBufSize + sizeof(SRrvTime_gCTS) + cbMICHDR +
|
sizeof(struct vnt_cts));
|
||||||
|
cbHeaderSize = wTxBufSize + sizeof(struct vnt_rrv_time_cts) + cbMICHDR +
|
||||||
sizeof(struct vnt_cts) + sizeof(STxDataHead_g);
|
sizeof(struct vnt_cts) + sizeof(STxDataHead_g);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,13 @@ struct vnt_rrv_time_rts {
|
||||||
u16 wTxRrvTime_a;
|
u16 wTxRrvTime_a;
|
||||||
} __packed;
|
} __packed;
|
||||||
|
|
||||||
|
struct vnt_rrv_time_cts {
|
||||||
|
u16 wCTSTxRrvTime_ba;
|
||||||
|
u16 wReserved;
|
||||||
|
u16 wTxRrvTime_b;
|
||||||
|
u16 wTxRrvTime_a;
|
||||||
|
} __packed;
|
||||||
|
|
||||||
/* RTS buffer header */
|
/* RTS buffer header */
|
||||||
struct vnt_rts_g {
|
struct vnt_rts_g {
|
||||||
u8 bySignalField_b;
|
u8 bySignalField_b;
|
||||||
|
|
Loading…
Reference in a new issue