diff options
author | Malcolm Priestley | 2015-02-01 12:59:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-02-07 10:16:59 +0100 |
commit | 187e2a81805f4b7ba1acf118aed8937a718d894c (patch) | |
tree | 36ddac851075b50e1576db557d331c26e8e321c0 /drivers/staging/vt6655 | |
parent | staging: lustre: lustre: osc: modifying seq_printf statements (diff) | |
download | kernel-qcow2-linux-187e2a81805f4b7ba1acf118aed8937a718d894c.tar.gz kernel-qcow2-linux-187e2a81805f4b7ba1acf118aed8937a718d894c.tar.xz kernel-qcow2-linux-187e2a81805f4b7ba1acf118aed8937a718d894c.zip |
staging: vt6655: move setting of PSTxDesc->buff_addr to vnt_tx_packet
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>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6655/rxtx.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 58559fae7cf1..9a801440d602 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -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) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 9cade85a86c5..07ce3fd88e70 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -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; } |