From patchwork Sat Aug 8 16:53:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 6975651 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2BCCD9F402 for ; Sat, 8 Aug 2015 16:54:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5420020498 for ; Sat, 8 Aug 2015 16:54:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AC59203B0 for ; Sat, 8 Aug 2015 16:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992594AbbHHQx7 (ORCPT ); Sat, 8 Aug 2015 12:53:59 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:33485 "EHLO mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992511AbbHHQx6 (ORCPT ); Sat, 8 Aug 2015 12:53:58 -0400 Received: by obbhe7 with SMTP id he7so2437512obb.0 for ; Sat, 08 Aug 2015 09:53:57 -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=E5aIdgvqB9ANBWY4PTRRnZqnFY3BxVcoQDs4WBuXCVs=; b=o/T8ubkUP9gDEYWhzDbJqPGb28LZ3oDcE3UICrcsgglJ0k8xFboCjKy6Rr2oGLLzAT ykV5OIJAz69stkzZcntn2upCdBM5PpXIbBCAuAiwInarvCR95XYbyVmwHrJMmgLnyiNa BZMWh3Z8cgCZWj7+rg4m+SeFQ6hGIRWT5o+0mR7zPjjhD4PlXBePfJBM7hgxr9ulfaN1 J1M/P566CPPiXJYk2wqit+Shw6lNFMiHyKOT6DTLf4JIzsstw4QKejJY5CpAxKs3c6/p HOa54lTkQI2I+oYR6dAcPN1kwPFO7pI9U833q2NdYFMqq6V5nvWlut01IT3rVwPTdbB3 bgtA== X-Received: by 10.60.173.233 with SMTP id bn9mr12722238oec.36.1439052837799; Sat, 08 Aug 2015 09:53:57 -0700 (PDT) Received: from linux.site (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id g10sm8561173obw.2.2015.08.08.09.53.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Aug 2015 09:53:56 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, pkshih , shaofu , Larry Finger Subject: [PATCH V3 NEXT 7/7] rtlwifi: rtl8821ae: Implement new rekey logic Date: Sat, 8 Aug 2015 11:53:39 -0500 Message-Id: <1439052819-30196-8-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439052819-30196-1-git-send-email-Larry.Finger@lwfinger.net> References: <1439052819-30196-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=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 From: pkshih Use the new capability in rtlwifi to prevent rekeying before EAPOL msg 4/4 has been sent. Signed-off-by: pkshih Signed-off-by: shaofu Signed-off-by: Larry Finger --- V2 - no changes V3 - no changes --- drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 8 ++++++++ drivers/net/wireless/rtlwifi/rtl8821ae/trx.h | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c index 174743a..a03015c 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c @@ -740,6 +740,14 @@ void rtl8821ae_tx_fill_desc(struct ieee80211_hw *hw, SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN); } + /* tx report */ + if (ptcb_desc->use_spe_rpt) { + u16 sn = rtl_get_tx_report_sn(hw); + + SET_TX_DESC_SPE_RPT(pdesc, 1); + SET_TX_DESC_SW_DEFINE(pdesc, sn); + } + /* ptcb_desc->use_driver_rate = true; */ SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate); if (ptcb_desc->hw_rate > DESC_RATEMCS0) diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h index 3140904..4717801 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.h @@ -185,6 +185,19 @@ #define SET_TX_DESC_RTS_SC(__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+20, 13, 4, __val) +#define SET_TX_DESC_SW_DEFINE(__pdesc, __val) \ + SET_BITS_TO_LE_4BYTE(__pdesc + 24, 0, 12, __val) +#define SET_TX_DESC_ANTSEL_A(__pdesc, __val) \ + SET_BITS_TO_LE_4BYTE(__pdesc + 24, 16, 3, __val) +#define SET_TX_DESC_ANTSEL_B(__pdesc, __val) \ + SET_BITS_TO_LE_4BYTE(__pdesc + 24, 19, 3, __val) +#define SET_TX_DESC_ANTSEL_C(__pdesc, __val) \ + SET_BITS_TO_LE_4BYTE(__pdesc + 24, 22, 3, __val) +#define SET_TX_DESC_ANTSEL_D(__pdesc, __val) \ + SET_BITS_TO_LE_4BYTE(__pdesc + 24, 25, 3, __val) +#define SET_TX_DESC_MBSSID(__pdesc, __val) \ + SET_BITS_TO_LE_4BYTE(__pdesc + 24, 12, 4, __val) + #define SET_TX_DESC_TX_BUFFER_SIZE(__pdesc, __val) \ SET_BITS_TO_LE_4BYTE(__pdesc+28, 0, 16, __val)