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 125/146] staging: vt6655: Fix TD_FLAGS_NETIF_SKB only on TYPE_AC0DMA
    Date
    3.19.8-ckt2 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Malcolm Priestley <tvboxspy@gmail.com>

    commit d17f4c8a42256dae6aa598bdbc00eff8b38cc949 upstream.

    Allow only TD_FLAGS_NETIF_SKB on ring buffer TYPE_AC0DMA for data
    only transfers for correct reporting of tx rates.

    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 | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
    index cc84098..4d29c05 100644
    --- a/drivers/staging/vt6655/device_main.c
    +++ b/drivers/staging/vt6655/device_main.c
    @@ -1252,12 +1252,13 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)

    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) {
    + head_td->pTDInfo->byFlags = TD_FLAGS_NETIF_SKB;

    - if (dma_idx == TYPE_AC0DMA)
    MACvTransmitAC0(priv->PortOffset);
    - else
    + } else {
    MACvTransmit0(priv->PortOffset);
    + }

    spin_unlock_irqrestore(&priv->lock, flags);

    --
    1.9.1


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