staging: vt6656: s_vFillCTSHead join structures of vnt_cts* to union vnt_tx_data_head

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

structures vnt_cts and vnt_cts_fb are members of union vnt_tx_data_head.

Create pointer union head and point structures to the correct member.

Point the union to pvCTS.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 98224bc3ea5ff01099ec429d0a19ad925c156561..fd3c5982415203fa6aea2a98ef134e81a83933eb 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -760,15 +760,15 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,
        u8 byPktType, void *pvCTS, u32 cbFrameLength, int bNeedAck,
        u16 wCurrentRate, u8 byFBOption)
 {
+       union vnt_tx_data_head *head = pvCTS;
        u32 uCTSFrameLen = 14;
 
-    if (pvCTS == NULL) {
-        return;
-    }
+       if (!head)
+               return;
 
        if (byFBOption != AUTO_FB_NONE) {
                /* Auto Fall back */
-               struct vnt_cts_fb *pBuf = (struct vnt_cts_fb *)pvCTS;
+               struct vnt_cts_fb *pBuf = &head->cts_g_fb;
                /* Get SignalField,ServiceField,Length */
                BBvCalculateParameter(pDevice, uCTSFrameLen,
                        pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);
@@ -788,7 +788,7 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,
                pBuf->data.frame_control = TYPE_CTL_CTS;
                memcpy(pBuf->data.ra, pDevice->abyCurrentNetAddr, ETH_ALEN);
        } else {
-               struct vnt_cts *pBuf = (struct vnt_cts *)pvCTS;
+               struct vnt_cts *pBuf = &head->cts_g;
                /* Get SignalField,ServiceField,Length */
                BBvCalculateParameter(pDevice, uCTSFrameLen,
                        pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);