OSDN Git Service

staging: vt6655: move setting of PSTxDesc->buff_addr to vnt_tx_packet
authorMalcolm Priestley <tvboxspy@gmail.com>
Sun, 1 Feb 2015 11:59:38 +0000 (11:59 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Feb 2015 09:16:59 +0000 (17:16 +0800)
Keep setting of this part of the structure with the others.

Only pTDInfo needs carried in the buffer structure.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c
drivers/staging/vt6655/rxtx.c

index 58559fa..9a80144 100644 (file)
@@ -1217,6 +1217,8 @@ 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->pTDInfo->byFlags = TD_FLAGS_NETIF_SKB;
 
        if (dma_idx == TYPE_AC0DMA)
index 9cade85..07ce3fd 100644 (file)
@@ -1207,7 +1207,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;
-       ptdCurr->buff_addr = cpu_to_le32(ptdCurr->pTDInfo->skb_dma);
 
        return cbHeaderLength;
 }