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 s_create new function to endian correct uGetTxRsvTime.
We can't endian correct uGetTxRsvTime because it is called by other functions. Create new function to vnt_rxtx_rsvtime_le16 to return little endian u16 value. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
cfabe4b43c
commit
9c3806d5a8
1 changed files with 25 additions and 8 deletions
|
@ -348,6 +348,13 @@ static u32 s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType,
|
|||
}
|
||||
}
|
||||
|
||||
static u16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
|
||||
u32 frame_length, u16 rate, int need_ack)
|
||||
{
|
||||
return cpu_to_le16((u16)s_uGetTxRsvTime(priv, pkt_type,
|
||||
frame_length, rate, need_ack));
|
||||
}
|
||||
|
||||
//byFreqType: 0=>5GHZ 1=>2.4GHZ
|
||||
static u16 s_uGetRTSCTSRsvTime(struct vnt_private *pDevice,
|
||||
u8 byRTSRsvType, u8 byPktType, u32 cbFrameLength, u16 wCurrentRate)
|
||||
|
@ -882,8 +889,11 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wRTSTxRrvTime_bb = s_uGetRTSCTSRsvTime(pDevice, 0,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
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_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);
|
||||
}
|
||||
//Fill RTS
|
||||
s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
|
||||
|
@ -894,8 +904,11 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
if (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_b = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
|
||||
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);
|
||||
}
|
||||
|
@ -912,7 +925,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
(struct vnt_rrv_time_ab *)pvRrvTime;
|
||||
pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 2,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wTxRrvTime = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, byPktType,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
}
|
||||
//Fill RTS
|
||||
s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
|
||||
|
@ -922,7 +936,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
if (pvRrvTime) {
|
||||
struct vnt_rrv_time_ab *pBuf =
|
||||
(struct vnt_rrv_time_ab *)pvRrvTime;
|
||||
pBuf->wTxRrvTime = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK)); //0:OFDM
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -935,7 +950,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
(struct vnt_rrv_time_ab *)pvRrvTime;
|
||||
pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 0,
|
||||
byPktType, cbFrameSize, wCurrentRate);
|
||||
pBuf->wTxRrvTime = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
}
|
||||
//Fill RTS
|
||||
s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
|
||||
|
@ -945,7 +961,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
|
|||
if (pvRrvTime) {
|
||||
struct vnt_rrv_time_ab *pBuf =
|
||||
(struct vnt_rrv_time_ab *)pvRrvTime;
|
||||
pBuf->wTxRrvTime = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK)); //1:CCK
|
||||
pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B,
|
||||
cbFrameSize, wCurrentRate, bNeedACK);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue