From patchwork Thu Oct 30 04:17:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 5193461 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67BCEC11AC for ; Thu, 30 Oct 2014 04:18:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C84192024F for ; Thu, 30 Oct 2014 04:17:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EC5A202B8 for ; Thu, 30 Oct 2014 04:17:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752367AbaJ3ER3 (ORCPT ); Thu, 30 Oct 2014 00:17:29 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:57008 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbaJ3ER1 (ORCPT ); Thu, 30 Oct 2014 00:17:27 -0400 Received: by mail-pd0-f175.google.com with SMTP id y13so4347530pdi.34 for ; Wed, 29 Oct 2014 21:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=bqnXbHBxLtfGi1bL16bKqTnT/v6FeTRD3AGhQW9h38o=; b=PaugXo2qpe15e8JiuqekNCzH5O/gIQsLwK1PvaCGun39blsOAWf6bS3P3SDcVAtIlJ 8t8qPxWW6FPc9Q8tqYz0tDf5BeF4+/42iBq44kYD0OLTCGpcJMSD1kj0yotDlsQtNw1c jyIDjcDPnmQxQNa9UVS5srFgKpcRDN/dMmsFd3upzotQT1/4+3tmgxw91oqikwQ6cKVL GgnCI4TQpJWk7IJIzfmsp8ViPlXhDTaK57vrudQW9urvF9M1OA1yhLGSgWkENwLrmFLk YOQkszcj+Gox+AiVjwcT3xv1DJYuZwR16AV4POCI6pFTMZlqqLhqwj2yiLaJ9u/b9gEV pLBg== X-Received: by 10.70.127.239 with SMTP id nj15mr14632011pdb.125.1414642646482; Wed, 29 Oct 2014 21:17:26 -0700 (PDT) Received: from linux.site.site (104-9-16-198.lightspeed.renonv.sbcglobal.net. [104.9.16.198]) by mx.google.com with ESMTPSA id fv3sm5744931pac.7.2014.10.29.21.17.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 21:17:25 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org, Murilo Opsfelder Araujo Subject: [PATCH 3/6i V3.18] rtlwifi: rtl8192se: Add missing section to read descriptor setting Date: Wed, 29 Oct 2014 23:17:10 -0500 Message-Id: <1414642633-3700-4-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414642633-3700-1-git-send-email-Larry.Finger@lwfinger.net> References: <1414642633-3700-1-git-send-email-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY, URIBL_BLACK 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 The new version of rtlwifi needs code in rtl92se_get_desc() that returns the buffer address for read operations. Signed-off-by: Larry Finger Cc: Murilo Opsfelder Araujo --- drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 ++ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h index 83c9867..6e7a70b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h +++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h @@ -446,6 +446,8 @@ /* DWORD 6 */ #define SET_RX_STATUS__DESC_BUFF_ADDR(__pdesc, __val) \ SET_BITS_OFFSET_LE(__pdesc + 24, 0, 32, __val) +#define GET_RX_STATUS_DESC_BUFF_ADDR(__pdesc) \ + SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32) #define SE_RX_HAL_IS_CCK_RATE(_pdesc)\ (GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE1M || \ diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c index b358ebc..672fd3b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c @@ -640,6 +640,9 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name) case HW_DESC_RXPKT_LEN: ret = GET_RX_STATUS_DESC_PKT_LEN(desc); break; + case HW_DESC_RXBUFF_ADDR: + ret = GET_RX_STATUS_DESC_BUFF_ADDR(desc); + break; default: RT_ASSERT(false, "ERR rxdesc :%d not process\n", desc_name);