From patchwork Mon Jun 17 07:37:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Gong X-Patchwork-Id: 10998139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 65AD776 for ; Mon, 17 Jun 2019 07:38:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50FC4286D1 for ; Mon, 17 Jun 2019 07:38:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 437C528864; Mon, 17 Jun 2019 07:38:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E76F0286D1 for ; Mon, 17 Jun 2019 07:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=/CzSa0Zl9IR8o37MbQ6qwbTSUVn+AAPxaTvSZgC5rUo=; b=g7m c/sN9dHJXMXLNMil9CW9DjYCowhuDwxDN7Qwkeq+Qu0FSbBiF/ItQNUBYICsSwCPI2LAziqOWsA8P uQPWsC5JwDAO6PbrDb6FBC3qk+Brym2K4YIIUONnSLcq3Z8IbVKYsvzzCzJK7DFMjoUIfpQYp7Ca2 WCsVCS6AxWjZ87Lrm1UCVw9QhQ2JIsgxpwrMfwdGseepNGTErSgxZgt8xR62GSufLE21iSRkwE5OU RwLNaJ/UAQrXXIb0d2pGffMzcIGRqWwacWnHc2u8TdoBYey/y7pA0U0t/+r3ewI7Pk6fF9MN51Gt2 jMRqaXdh0h5VAhcZSLwrTp4evl8+NOw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hcmDu-0006yK-51; Mon, 17 Jun 2019 07:38:38 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hcmDp-0006q6-T6 for ath10k@lists.infradead.org; Mon, 17 Jun 2019 07:38:35 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 77F7B60A44; Mon, 17 Jun 2019 07:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1560757113; bh=4zwy2dPQuSTet8S1EGgrunmmJm4kL4MEEtL33hgHrUM=; h=From:To:Cc:Subject:Date:From; b=jso8wdaIbYRNrmE1jFazvWo1dUOcY8DogJwSfy7RTtrkpTvfKovU35104/SfEGef5 OxQimJyRt/znfRF+Opee+NqAYh2TE/tx6RO2B+XEeS8Fgd8zYCtKMTUqErcZD0YhOX pUifjJpPI7YhRvt33vLkt3tHHuM1Pirb0+HGG1WI= Received: from localhost.localdomain (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: wgong@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 35CDA606FC; Mon, 17 Jun 2019 07:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1560757113; bh=4zwy2dPQuSTet8S1EGgrunmmJm4kL4MEEtL33hgHrUM=; h=From:To:Cc:Subject:Date:From; b=jso8wdaIbYRNrmE1jFazvWo1dUOcY8DogJwSfy7RTtrkpTvfKovU35104/SfEGef5 OxQimJyRt/znfRF+Opee+NqAYh2TE/tx6RO2B+XEeS8Fgd8zYCtKMTUqErcZD0YhOX pUifjJpPI7YhRvt33vLkt3tHHuM1Pirb0+HGG1WI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 35CDA606FC Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=wgong@codeaurora.org From: Wen Gong To: ath10k@lists.infradead.org Subject: [PATCH] ath10k: add mic bytes for pmf management packet Date: Mon, 17 Jun 2019 15:37:59 +0800 Message-Id: <1560757079-19266-1-git-send-email-wgong@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190617_003834_099441_A8085E95 X-CRM114-Status: UNSURE ( 9.11 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For PMF case, the action,deauth,disassoc management need to encrypt by hardware, it need to reserve 8 bytes for encryption, otherwise the packet will be sent out with error format, then PMF case will fail. After add the 8 bytes, it will pass the PMF case. Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00005-QCARMSWP-1. Signed-off-by: Wen Gong --- drivers/net/wireless/ath/ath10k/htt_tx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index d8e9cc0..7bef9d9 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -1236,6 +1236,7 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm struct ath10k *ar = htt->ar; int res, data_len; struct htt_cmd_hdr *cmd_hdr; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; struct htt_data_tx_desc *tx_desc; struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); struct sk_buff *tmp_skb; @@ -1245,6 +1246,13 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm u8 flags0 = 0; u16 flags1 = 0; + if ((ieee80211_is_action(hdr->frame_control) || + ieee80211_is_deauth(hdr->frame_control) || + ieee80211_is_disassoc(hdr->frame_control)) && + ieee80211_has_protected(hdr->frame_control)) { + skb_put(msdu, IEEE80211_CCMP_MIC_LEN); + } + data_len = msdu->len; switch (txmode) {