From patchwork Wed Jun 17 22:21:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 485737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id CE2411401DA; Thu, 18 Jun 2015 08:21:58 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Z5LiV-0005wa-D7; Wed, 17 Jun 2015 22:21:55 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Z5LiJ-0005rt-E8 for kernel-team@lists.ubuntu.com; Wed, 17 Jun 2015 22:21:43 +0000 Received: from [10.172.68.52] (helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1Z5LiJ-0002qL-7U; Wed, 17 Jun 2015 22:21:43 +0000 Received: from kamal by fourier with local (Exim 4.82) (envelope-from ) id 1Z5LiG-00006w-Vl; Wed, 17 Jun 2015 15:21:40 -0700 From: Kamal Mostafa To: Malcolm Priestley Subject: [3.19.y-ckt stable] Patch "staging: vt6655: Fix TD_FLAGS_NETIF_SKB only on TYPE_AC0DMA" has been added to staging queue Date: Wed, 17 Jun 2015 15:21:35 -0700 Message-Id: <1434579695-395-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 X-Extended-Stable: 3.19 Cc: Greg Kroah-Hartman , Kamal Mostafa , kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled staging: vt6655: Fix TD_FLAGS_NETIF_SKB only on TYPE_AC0DMA to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue This patch is scheduled to be released in version 3.19.8-ckt2. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.19.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 91a33f51a08280258f3450f23204991ad634e4de Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 1 Feb 2015 11:59:40 +0000 Subject: staging: vt6655: Fix TD_FLAGS_NETIF_SKB only on TYPE_AC0DMA 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(-) -- 1.9.1 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);