hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: vt6656: rxtx s_vFillRTSHead create union of vnt_rts*/vnt_cts* structures. 

Only one of vnt_rts*/vnt_cts* structures are accessed at any one time.

Join these structures in to a single union.

These will eventually form the tail structure of vnt_tx_buffer and
include structures vnt_tx_datahead*

Structures in s_vFillCTSHead will join in next patch series.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2013-08-26 11:17:52 +01:00 committed by Greg Kroah-Hartman
parent 9d2578c170
commit 13fe62ae6a
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/vt6656/rxtx.c
View File

@ -720,48 +720,39 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
void *pvRTS, u32 cbFrameLength, int bNeedAck, void *pvRTS, u32 cbFrameLength, int bNeedAck,
struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption) struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption)
{ {
union vnt_tx_data_head *head = pvRTS;
if (pvRTS == NULL) if (!head)
return; return;
// Note: So far RTSHead doesn't appear in ATIM & Beacom DMA, so we don't need to take them into account. // Note: So far RTSHead doesn't appear in ATIM & Beacom DMA, so we don't need to take them into account.
// Otherwise, we need to modified codes for them. // Otherwise, we need to modified codes for them.
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) {
struct vnt_rts_g *pBuf = (struct vnt_rts_g *)pvRTS; vnt_rxtx_rts_g_head(pDevice, &head->rts_g,
vnt_rxtx_rts_g_head(pDevice, pBuf,
psEthHeader, byPktType, cbFrameLength, psEthHeader, byPktType, cbFrameLength,
bNeedAck, wCurrentRate, byFBOption); bNeedAck, wCurrentRate, byFBOption);
} }
else { else {
struct vnt_rts_g_fb *pBuf = (struct vnt_rts_g_fb *)pvRTS; vnt_rxtx_rts_g_fb_head(pDevice, &head->rts_g_fb,
vnt_rxtx_rts_g_fb_head(pDevice, pBuf,
psEthHeader, byPktType, cbFrameLength, psEthHeader, byPktType, cbFrameLength,
bNeedAck, wCurrentRate, byFBOption); bNeedAck, wCurrentRate, byFBOption);
} // if (byFBOption == AUTO_FB_NONE) } // if (byFBOption == AUTO_FB_NONE)
} }
else if (byPktType == PK_TYPE_11A) { else if (byPktType == PK_TYPE_11A) {
if (byFBOption == AUTO_FB_NONE) { if (byFBOption == AUTO_FB_NONE) {
struct vnt_rts_ab *pBuf = (struct vnt_rts_ab *)pvRTS; vnt_rxtx_rts_ab_head(pDevice, &head->rts_ab,
vnt_rxtx_rts_ab_head(pDevice, pBuf,
psEthHeader, byPktType, cbFrameLength, psEthHeader, byPktType, cbFrameLength,
bNeedAck, wCurrentRate, byFBOption); bNeedAck, wCurrentRate, byFBOption);
} }
else { else {
struct vnt_rts_a_fb *pBuf = (struct vnt_rts_a_fb *)pvRTS; vnt_rxtx_rts_a_fb_head(pDevice, &head->rts_a_fb,
vnt_rxtx_rts_a_fb_head(pDevice, pBuf,
psEthHeader, byPktType, cbFrameLength, psEthHeader, byPktType, cbFrameLength,
bNeedAck, wCurrentRate, byFBOption); bNeedAck, wCurrentRate, byFBOption);
} }
} }
else if (byPktType == PK_TYPE_11B) { else if (byPktType == PK_TYPE_11B) {
struct vnt_rts_ab *pBuf = (struct vnt_rts_ab *)pvRTS; vnt_rxtx_rts_ab_head(pDevice, &head->rts_ab,
vnt_rxtx_rts_ab_head(pDevice, pBuf,
psEthHeader, byPktType, cbFrameLength, psEthHeader, byPktType, cbFrameLength,
bNeedAck, wCurrentRate, byFBOption); bNeedAck, wCurrentRate, byFBOption);
} }

12
drivers/staging/vt6656/rxtx.h
View File

@ -168,6 +168,18 @@ struct vnt_cts_fb {
u16 reserved2; u16 reserved2;
} __packed; } __packed;
union vnt_tx_data_head {
/* rts g */
struct vnt_rts_g rts_g;
struct vnt_rts_g_fb rts_g_fb;
/* rts a/b */
struct vnt_rts_ab rts_ab;
struct vnt_rts_a_fb rts_a_fb;
/* cts g */
struct vnt_cts cts_g;
struct vnt_cts_fb cts_g_fb;
};
struct vnt_tx_buffer { struct vnt_tx_buffer {
u8 byType; u8 byType;
u8 byPKTNO; u8 byPKTNO;