lkml.org 
[lkml]   [2015]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 124/146] staging: vt6655: move setting of PSTxDesc->buff_addr to vnt_tx_packet
    Date
    3.19.8-ckt2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Malcolm Priestley <tvboxspy@gmail.com>

    commit 187e2a81805f4b7ba1acf118aed8937a718d894c upstream.

    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>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/staging/vt6655/device_main.c | 2 ++
    drivers/staging/vt6655/rxtx.c | 1 -
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
    index b7f6d95..cc84098 100644
    --- a/drivers/staging/vt6655/device_main.c
    +++ b/drivers/staging/vt6655/device_main.c
    @@ -1250,6 +1250,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 baaab3f..986fa11 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;
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-06-18 01:41    [W:4.666 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site