From patchwork Thu Oct 30 04:17:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 5193481 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 D62EAC11AC for ; Thu, 30 Oct 2014 04:18:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3973B2025B for ; Thu, 30 Oct 2014 04:18:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 811A52024F for ; Thu, 30 Oct 2014 04:18:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755234AbaJ3ERs (ORCPT ); Thu, 30 Oct 2014 00:17:48 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:65370 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752348AbaJ3ER2 (ORCPT ); Thu, 30 Oct 2014 00:17:28 -0400 Received: by mail-pd0-f172.google.com with SMTP id r10so4336902pdi.31 for ; Wed, 29 Oct 2014 21:17:27 -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=IVmUoKQVohbvAmagSXrVgF5yLmrYV39c0qhQTxsrYns=; b=uPRRkfvIaMU3CCnRVQ83bELzuqORBxORZsXiGGCcSg3ypIwur1Y7B5OWx/DE6VOkUR iwu3z3iujFHs+USp/Q9nB7fw/69xa31aCvLAKqAH9iMdBSIyQYJvDvGBAGt8sLqpt4jl iDdSz4W4yBlUHtKdeo9wH0voqLOzZK1PDxVPcFB+VQL8fTCrzw55ImbmwDazc46FoFEh zVoz7HnLXltRVv90Gd2DAMBDfLIHJ6BatiI58By/0bVXHhvLS5ZR+YnvhS2J++GYyt86 MMObOMLHkMTCbPF4+RzMRFixXc0hk8K2LFtjwYftqI2RQ3MT0Q9ZYxe0dzmjXSfUL2iw f5Fw== X-Received: by 10.66.147.227 with SMTP id tn3mr3679200pab.108.1414642647825; Wed, 29 Oct 2014 21:17:27 -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.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 21:17:27 -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 4/6i V3.18] rtlwifi: rtl8192ce: Add missing section to read descriptor setting Date: Wed, 29 Oct 2014 23:17:11 -0500 Message-Id: <1414642633-3700-5-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 rtl92ce_get_desc() that returns the buffer address for read operations. Signed-off-by: Larry Finger Cc: Murilo Opsfelder Araujo --- drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 2 ++ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h index 831df10..9b660df 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h @@ -114,6 +114,8 @@ LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 16, 4) #define GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr) \ LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12) +#define GET_RX_STATUS_DESC_BUFF_ADDR(__pdesc) \ + SHIFT_AND_MASK_LE(__pdesc + 24, 0, 32) #define CHIP_VER_B BIT(4) #define CHIP_BONDING_IDENTIFIER(_value) (((_value) >> 22) & 0x3) diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index 2fb9c7a..dc3d20b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c @@ -728,6 +728,9 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name) case HW_DESC_RXPKT_LEN: ret = GET_RX_DESC_PKT_LEN(pdesc); break; + case HW_DESC_RXBUFF_ADDR: + ret = GET_RX_STATUS_DESC_BUFF_ADDR(pdesc); + break; default: RT_ASSERT(false, "ERR rxdesc :%d not process\n", desc_name);