staging: vt6655: remove unnecessary variable skb_dma

skb_dma flips from 0 to the contents buf_dma.

This is nolonger necessary so use buf_dma directly
and remove skb_dma altogether.

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

diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 758eeb2afd512a5e2d0e2928fdcbe3acf3f37145..d56810133da42a3a9323975a055848f6f1bb9af5 100644 (file)
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -256,7 +256,6 @@ typedef struct tagDEVICE_TD_INFO {
        void *mic_hdr;
        struct sk_buff *skb;
        unsigned char *buf;
-       dma_addr_t          skb_dma;
        dma_addr_t          buf_dma;
        dma_addr_t          curr_desc;
        unsigned long dwReqCount;

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 695aa25e819d6b280db5dc6d03ab1c2d17b65170..89611a70d785e61c14f11ea63c834871f3771a83 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -970,7 +970,6 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc)
        if (skb)
                ieee80211_tx_status_irqsafe(pDevice->hw, skb);
 
-       pTDInfo->skb_dma = 0;
        pTDInfo->skb = NULL;
        pTDInfo->byFlags = 0;
 }
@@ -1201,7 +1200,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
        head_td->m_td1TD1.wReqCount =
                        cpu_to_le16((u16)head_td->pTDInfo->dwReqCount);
 
-       head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->skb_dma);
+       head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->buf_dma);
 
        /* Poll Transmit the adapter */
        wmb();

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 0ffa9bf712be4d69d84d3271716a1b5056ea3e68..82380f3ed05bb267e04920673fb80837e4e36a0a 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1202,7 +1202,6 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
 
        ptdCurr->pTDInfo->dwReqCount = cbReqCount;
        ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength;
-       ptdCurr->pTDInfo->skb_dma = ptdCurr->pTDInfo->buf_dma;
 
        return cbHeaderLength;
 }