From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754989AbbFQXHM (ORCPT ); Wed, 17 Jun 2015 19:07:12 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:35272 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932945AbbFQW0c (ORCPT ); Wed, 17 Jun 2015 18:26:32 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Malcolm Priestley , Greg Kroah-Hartman , Kamal Mostafa Subject: [PATCH 3.19.y-ckt 125/146] staging: vt6655: Fix TD_FLAGS_NETIF_SKB only on TYPE_AC0DMA Date: Wed, 17 Jun 2015 15:23:50 -0700 Message-Id: <1434579851-1719-126-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434579851-1719-1-git-send-email-kamal@canonical.com> References: <1434579851-1719-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.19 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.19.8-ckt2 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Malcolm Priestley 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Kamal Mostafa --- 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