From patchwork Wed Mar 26 19:58:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Merello X-Patchwork-Id: 3894951 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D0FA39F2E8 for ; Wed, 26 Mar 2014 19:57:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1DAC2021F for ; Wed, 26 Mar 2014 19:57:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB4902021C for ; Wed, 26 Mar 2014 19:57:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756221AbaCZT5h (ORCPT ); Wed, 26 Mar 2014 15:57:37 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:33522 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755898AbaCZT5e (ORCPT ); Wed, 26 Mar 2014 15:57:34 -0400 Received: by mail-ee0-f41.google.com with SMTP id t10so2101025eei.28 for ; Wed, 26 Mar 2014 12:57:33 -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; bh=W8rnn13HdXwU6Mbr93FxMezIK8rnBoQ8dtLO6l5UQ1U=; b=X7alQm4EwHFr6jNR5NEgR+gUkAMdqRdQMhhr2BNctAIBHiFXruKr+bEbQ7Qhqufn8A M+glCLj07htQ27NRSkNsOFtlh5XWCxjx6cwbdSI3J15X287XidquaVIl2f+XOHnub1Cf fHCg+hwgvV9oqxucc9VXMWTMJH7xPo/Qxw1T6fkFJDHI/h5RqMOjUANFnznqha5qRnx3 urliMXPyU1yAGrrtS+shNAx0lLMxtGRSog5tb+Fbz+otebr3ExUN4CBgmBh0aCTn+/as 1vvyB/3/1rjiftAd2mzNWdDZs576/VKpR87zFNL3x+rf3E5YSKU/ZimvmYxfvU6ZD5JB mXOQ== X-Received: by 10.14.206.137 with SMTP id l9mr77680387eeo.40.1395863853855; Wed, 26 Mar 2014 12:57:33 -0700 (PDT) Received: from localhost.localdomain (host179-124-dynamic.6-79-r.retail.telecomitalia.it. [79.6.124.179]) by mx.google.com with ESMTPSA id a42sm31038960ees.10.2014.03.26.12.57.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 12:57:33 -0700 (PDT) From: Andrea Merello To: linville@tuxdriver.com Cc: andrea.merello@gmail.com, linux-wireless@vger.kernel.org, Larry.Finger@lwfinger.net, bernhard@schiffner-limbach.de, dan.carpenter@oracle.com Subject: [PATCH 03/20] rtl8180: add rtl8187se fields to TX descriptor Date: Wed, 26 Mar 2014 20:58:43 +0100 Message-Id: <1395863923-4427-1-git-send-email-andrea.merello@gmail.com> X-Mailer: git-send-email 1.8.3.2 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.2 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 This patch modifies the TX descriptor struct so it can work also for rtl8187se. Some reserved field is now meaningful, and where needed union is used. Signed-off-by: Andrea Merello --- drivers/net/wireless/rtl818x/rtl8180/rtl8180.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h index e7127f3..47a084c 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h +++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h @@ -34,13 +34,25 @@ struct rtl8180_tx_desc { __le16 rts_duration; __le16 plcp_len; __le32 tx_buf; - __le32 frame_len; + union{ + __le32 frame_len; + struct { + __le16 frame_len_se; + __le16 frame_duration; + } __packed; + } __packed; __le32 next_tx_desc; u8 cw; u8 retry_limit; u8 agc; u8 flags2; - u32 reserved[2]; + /* rsvd for 8180/8185. + * valid for 8187se but we dont use it + */ + u32 reserved; + /* all rsvd for 8180/8185 */ + __le16 flags3; + __le16 frag_qsize; } __packed; struct rtl8180_rx_desc {