From patchwork Sun Feb 1 11:59:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 5756611 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7BDF9BF440 for ; Sun, 1 Feb 2015 12:00:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75FC5201F4 for ; Sun, 1 Feb 2015 12:00:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B870201F2 for ; Sun, 1 Feb 2015 12:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752797AbbBAMAM (ORCPT ); Sun, 1 Feb 2015 07:00:12 -0500 Received: from mail-we0-f172.google.com ([74.125.82.172]:43212 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752722AbbBAMAK (ORCPT ); Sun, 1 Feb 2015 07:00:10 -0500 Received: by mail-we0-f172.google.com with SMTP id q59so34344206wes.3 for ; Sun, 01 Feb 2015 04:00:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=hAGP6iiTxoighKluDtLw8TZMgrz5Kvcc9Gs8b++IGuA=; b=bgeWlZi9SZfOuzpfDZneck/C4B774mqcBbnvv08vtLvAtC2VAW4zdBm0bJQWsVGn4+ ezzBnNcMETov4xeEHgKvebdm0BEmtlzV5yj7va4mmsL/r8zGKm8fMX8tVV2VxMOG/ZhS IAdlP4DNcdfVblrVsJOjd9Tr8skwVTX1KbpoPV3ftZTqUq41t4WmaTeIOJT4H4A0aPBb thcfSbek0b+/I7xdnLKzBXX0RwWE9n2DZHhUSdeQwLnj+KjtjLuknYFiLK6S4OybB/X2 qowv0eqe07Xao+wKo0fhwaX0GMZLP4VhlIIaeKdpQ9SWwQhpSmAlqxoOe78pKQ0pVMli B8TA== X-Received: by 10.180.189.52 with SMTP id gf20mr13387727wic.27.1422792009160; Sun, 01 Feb 2015 04:00:09 -0800 (PST) Received: from tipsey.3.home (94.196.240.163.threembb.co.uk. [94.196.240.163]) by mx.google.com with ESMTPSA id ud9sm15074446wib.5.2015.02.01.04.00.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Feb 2015 04:00:07 -0800 (PST) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Malcolm Priestley Subject: [PATCH 1/6] staging: vt6655: move setting of PSTxDesc->buff_addr to vnt_tx_packet Date: Sun, 1 Feb 2015 11:59:38 +0000 Message-Id: <1422791983-3408-1-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Keep setting of this part of the structure with the others. Only pTDInfo needs carried in the buffer structure. Signed-off-by: Malcolm Priestley --- 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 58559fa..9a80144 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 9cade85..07ce3fd 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; }