From patchwork Tue Jan 20 10:42:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5667411 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6D184C058D for ; Tue, 20 Jan 2015 10:43:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA8CB2035B for ; Tue, 20 Jan 2015 10:43:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CED5A2034A for ; Tue, 20 Jan 2015 10:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753800AbbATKn1 (ORCPT ); Tue, 20 Jan 2015 05:43:27 -0500 Received: from mail-we0-f169.google.com ([74.125.82.169]:34141 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774AbbATKn0 (ORCPT ); Tue, 20 Jan 2015 05:43:26 -0500 Received: by mail-we0-f169.google.com with SMTP id p10so12778657wes.0 for ; Tue, 20 Jan 2015 02:43:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vkMnvNE7SjJpQlrs4SOzKmUPI5oy1nUfZhPn6MDe9YU=; b=iKHmgm20qnczna7rt0HMHsej/NneAENME7x2HsqsfiXAyKlfz2aJv3d+bXX5xW+VvQ YEIViGL9seVW/ZPPHK9Oogq0JEba7t3VHH1S/2jrgVpAimmHaTprZ9lc9GgEEyVez+41 ZxJ0ehnpaZWP/lRi5tu3y85JbnTtBtxwKYPU0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vkMnvNE7SjJpQlrs4SOzKmUPI5oy1nUfZhPn6MDe9YU=; b=FRBet4niiiE3rewvgLbjeTdXwirIc1ZCN1qWtmbXsxIgNJcauemyIwYl61J5oV7aQt DvPzRvAlXTUtgOYIzwjA4MOWn3xzBlwhrakmnbNuwFC2DCMqsuN+U859RevGtd32d32W 197v6c4s9kH03roVP5+ddl8fYqRvj9ivRolG+wUd5NpVd1p+t6yxlkhQIN0wTGZQhrXI K4s6GOr2kPHYHxx1kLYKESMpy9/hP7DSNJVS1rcjWrF6T4qkxv2yVxCgaqJr9lFu32lr uguTI8Ra6qWmQWppUAFervgWc2ILRu8pwK79gRhA2RoftxPp0oQu/EsLAiEHZn80Yr07 RTuw== X-Gm-Message-State: ALoCoQniIAJjkqL4OCuu0mvNU24iPL3KzXRF4oxOQVArpZh4My9KDsG4eKeT8aaHX/chH2teey//Za4/2NiSbw0U4uGckrmrKbfr3ZRWL7cVJ0fS8hKc5vV9/UD5Ey3rKF3ltcMO654x X-Received: by 10.194.142.174 with SMTP id rx14mr13414084wjb.110.1421750604937; Tue, 20 Jan 2015 02:43:24 -0800 (PST) Received: from bob.homerouter.cpe (apn-46-76-65-212.dynamic.gprs.plus.pl. [46.76.65.212]) by mx.google.com with ESMTPSA id da2sm10567030wjb.21.2015.01.20.02.43.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2015 02:43:24 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Marek Kwaczynski , Michal Kazior Subject: [PATCH 2/2] ath10k: fix pmf for wmi-tlv on qca6174 Date: Tue, 20 Jan 2015 11:42:43 +0100 Message-Id: <1421750563-15945-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1421750563-15945-1-git-send-email-michal.kazior@tieto.com> References: <1421750563-15945-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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: Marek Kwaczynski New wmi-tlv firmware uses HTT 3.0 protocol which uses TX_FRM command for management frames (instead of a dedicated command). To support PMF it is necessary to provide explicit tailroom. Signed-off-by: Marek Kwaczynski Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/htt_tx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index 5c64139..5780b87 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -481,6 +481,12 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) } skb_cb->htt.txbuf_paddr = paddr; + 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); + skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len, DMA_TO_DEVICE); res = dma_mapping_error(dev, skb_cb->paddr);