staging: vt6656: rxtx.c create structure to join vnt_tx_data_head with vnt_tx_head.
PATCH 2/5 staging: vt6656: rxtx.c create structure to join vnt_tx_data_head with vnt_tx_head.
Create struct vnt_tx_mic_hdr for with union vnt_tx_data_head for mic mode.
Create union vnt_tx for mic and non mic mode.
Attach vnt_rrv_time_* to relevant tx_head.
Signed-off-by Malcolm Priestley <[email protected]>
--- drivers/staging/vt6656/rxtx.c | 12 ++++++------ drivers/staging/vt6656/rxtx.h | 25 ++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 9 deletions(-)
drivers/staging/vt6656/rxtx.c +6 -6
@@ -870,7 +870,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,if (byPktType ==PK_TYPE_11GB || byPktType ==PK_TYPE_11GA ) {if (need_rts) {//Fill RsvTime -struct vnt_rrv_time_rts *pBuf = &tx_buffer->tx_head.rts; +struct vnt_rrv_time_rts *pBuf = &tx_buffer->tx_head.tx_rts.rts; pBuf->wRTSTxRrvTime_aa =s_uGetRTSCTSRsvTime (pDevice,2 , byPktType, cbFrameSize, wCurrentRate);
@@ -889,7 +889,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, }else {//RTS_needless, PCF mode //Fill RsvTime -struct vnt_rrv_time_cts *pBuf = &tx_buffer->tx_head.cts; +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);
@@ -906,7 +906,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,else if (byPktType ==PK_TYPE_11A ) {if (need_rts) {//Fill RsvTime -struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.ab; +struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.tx_ab.ab; pBuf->wRTSTxRrvTime =s_uGetRTSCTSRsvTime (pDevice,2 , byPktType, cbFrameSize, wCurrentRate);
@@ -917,7 +917,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, bNeedACK, psEthHeader, wCurrentRate, byFBOption); }else {//Fill RsvTime -struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.ab; +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);
@@ -926,7 +926,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,else if (byPktType ==PK_TYPE_11B ) {if (need_rts) {//Fill RsvTime -struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.ab; +struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.tx_ab.ab; pBuf->wRTSTxRrvTime =s_uGetRTSCTSRsvTime (pDevice,0 , byPktType, cbFrameSize, wCurrentRate);
@@ -938,7 +938,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, }else {//RTS_needless, non PCF mode //Fill RsvTime -struct vnt_rrv_time_ab *pBuf = &tx_buffer->tx_head.ab; +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);
drivers/staging/vt6656/rxtx.h +22 -3
@@ -180,10 +180,29 @@ union vnt_tx_data_head {struct vnt_cts_fb cts_g_fb; }; +struct vnt_tx_mic_hdr { +struct vnt_mic_hdr hdr; +union vnt_tx_data_head head; +} __packed; + +union vnt_tx { +struct vnt_tx_mic_hdr mic; +union vnt_tx_data_head head; +}; +union vnt_tx_head { -struct vnt_rrv_time_rts rts; -struct vnt_rrv_time_cts cts; -struct vnt_rrv_time_ab ab; +struct { +struct vnt_rrv_time_rts rts; +union vnt_tx tx; + } __packed tx_rts; +struct { +struct vnt_rrv_time_cts cts; +union vnt_tx tx; + } __packed tx_cts; +struct { +struct vnt_rrv_time_ab ab; +union vnt_tx tx; + } __packed tx_ab; };struct vnt_tx_fifo_head {
Signature · 1 line
1.8.3.2