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: 5667441 Return-Path: X-Original-To: patchwork-ath10k@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 9E29E9F2ED for ; Tue, 20 Jan 2015 10:43:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B617720396 for ; Tue, 20 Jan 2015 10:43:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E72A52037D for ; Tue, 20 Jan 2015 10:43:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDWHl-0002I8-OC; Tue, 20 Jan 2015 10:43:49 +0000 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDWHi-000294-R6 for ath10k@lists.infradead.org; Tue, 20 Jan 2015 10:43:47 +0000 Received: by mail-wi0-f170.google.com with SMTP id em10so3801389wid.1 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=GMlHQef4WjG0bd05kQ2DFU067qoRoQhaF8CuM+CXgkf3O5pmhgbJyGiMm6HqBNMd3j Eewq4gTZ1CyZ0VJxVfhCcBWUWgL9RS35V9uYnW0OQzHY3e5ZzwbwASX/UaHhCtXHHdKx uxA/xDy4DE45DTGzN7zQT4/1brqpOvi6zfqMhYvF6nNV/tP4Oy/0CgZg96S/JjEXIStO bczDEQB3Wd5+oGZyGkOVbShF2t8pdyPbLc/Wy3w/PzbTDXMZRrF9vBHbEv5F396mi5II Zs1cMvyxngXW8fOQKTVZrV69tKrbkl73dNxDRzkKk/9jX6IDxgMXV70wpjQ7plJW1dh4 04EQ== X-Gm-Message-State: ALoCoQmLXQCh6CxYwR3bxIvUatgV+ahJFaWeq3X+ueNOoS1JKl03j4d/7UEcOLYJYccP1W6C/o6ypBWyaAU2biTYvE+F4SZ7N1w0HL0ZCoG9iOyfjLOJAHIkd4rp5hTRhmeaf7NwAc46QG2FFgFRfDyZNSA6QFBKLFJcqpWHiHwJVQDCFqSEEFA= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150120_024347_072288_A4C50B41 X-CRM114-Status: UNSURE ( 7.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Marek Kwaczynski , linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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);