From patchwork Fri Aug 14 21:58:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 7019631 X-Patchwork-Delegate: kvalo@adurom.com 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 CBEC0C05AD for ; Fri, 14 Aug 2015 21:59:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEAB62049C for ; Fri, 14 Aug 2015 21:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03046206F0 for ; Fri, 14 Aug 2015 21:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753480AbbHNV7V (ORCPT ); Fri, 14 Aug 2015 17:59:21 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:34051 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752222AbbHNV7U (ORCPT ); Fri, 14 Aug 2015 17:59:20 -0400 Received: by wicne3 with SMTP id ne3so31639368wic.1 for ; Fri, 14 Aug 2015 14:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uSVz7h9AfkK44c6IVyRyDieyTYHs021QIT5/dknhftM=; b=0kvbPFWsq/8L4gPZrFwnbbGarrpPYGj8QlkEkck6r1xGZDR+yqu/h3StXNGnS6Fz44 D2WGEWXWXq572VmxIbJNtI/cw6ExlVB6jkPsdaN3c7Au3vs0CGQ+LHcqpGzDU8urTNal aDWqt2ZDplBilDP6/mRVFYXpDYstr0p+zeRJ/V28gjXCjD2e3BWPkjTsLmOgZsC37Lik nyd5itLPj/R0LwHRWezb9ALAipgwnYJuT4OOx+LFnFEVzfo7PKT8ZO2k4TtYvKXPTHPX pSLED16c6tiTSY0Kd6V3C0oq8ZtugqYCvvaUK1HH1N6SedSqPPrxW5nKlHgkLGowQKMo eYZA== X-Received: by 10.180.76.232 with SMTP id n8mr11012057wiw.72.1439589558969; Fri, 14 Aug 2015 14:59:18 -0700 (PDT) Received: from tipsey.3.home (188.31.106.31.threembb.co.uk. [188.31.106.31]) by smtp.gmail.com with ESMTPSA id s7sm4947902wix.23.2015.08.14.14.59.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Aug 2015 14:59:18 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley Subject: [PATCH 3/6] staging: vt6655: struct tagDEVICE_TD_INFO resize dwReqCount. Date: Fri, 14 Aug 2015 22:58:48 +0100 Message-Id: <1439589531-3059-3-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439589531-3059-1-git-send-email-tvboxspy@gmail.com> References: <1439589531-3059-1-git-send-email-tvboxspy@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 dwReqCount is no bigger than u16 Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/desc.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/rxtx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h index 6efe825..ab52c56 100644 --- a/drivers/staging/vt6655/desc.h +++ b/drivers/staging/vt6655/desc.h @@ -245,7 +245,7 @@ typedef struct tagDEVICE_TD_INFO { struct sk_buff *skb; unsigned char *buf; dma_addr_t buf_dma; - unsigned long dwReqCount; + u16 dwReqCount; unsigned long dwHeaderLength; unsigned char byFlags; } DEVICE_TD_INFO, *PDEVICE_TD_INFO; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 947e868..c3b7bd4 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1193,7 +1193,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) /* Set TSR1 & ReqCount in TxDescHead */ head_td->td1.tcr |= (TCR_STP | TCR_EDP | EDMSDU); - head_td->td1.req_count = cpu_to_le16((u16)head_td->pTDInfo->dwReqCount); + head_td->td1.req_count = cpu_to_le16(head_td->pTDInfo->dwReqCount); head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->buf_dma); diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 380b879..f3f6b15 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1200,7 +1200,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, ptdCurr = (PSTxDesc)pHeadTD; - ptdCurr->pTDInfo->dwReqCount = cbReqCount; + ptdCurr->pTDInfo->dwReqCount = (u16)cbReqCount; ptdCurr->pTDInfo->dwHeaderLength = cbHeaderLength; return cbHeaderLength;