From patchwork Wed Nov 18 05:59:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 7644741 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 D8ECC9F392 for ; Wed, 18 Nov 2015 05:59:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F15B4205B1 for ; Wed, 18 Nov 2015 05:59:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C0452062B for ; Wed, 18 Nov 2015 05:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754582AbbKRF7u (ORCPT ); Wed, 18 Nov 2015 00:59:50 -0500 Received: from mail-lf0-f45.google.com ([209.85.215.45]:35146 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbbKRF7f (ORCPT ); Wed, 18 Nov 2015 00:59:35 -0500 Received: by lfdo63 with SMTP id o63so19573307lfd.2 for ; Tue, 17 Nov 2015 21:59:34 -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=rHeLTrpgxr9OO7tHGqk86W11DOkFLwCi8NWoVr53h5M=; b=sxaMgjLMmwaPxzIS3p8Jdjj9+2IpRSZcGBBQRa+iSEX4p7KdeWX6oykyJkE6Y0aTIs mupPu3YSnVa/vsGvg98MmqBRTlz5koPoBaxuizde+Glt5ArSp8mt/+qqqrOlCF67Zhxx s6WG9OryecY89F8oJ7qCXk4hoCJdQMpZcT0vQ= 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=rHeLTrpgxr9OO7tHGqk86W11DOkFLwCi8NWoVr53h5M=; b=QuEN/+sUecZzdggwcoJinHDIpKD5pv7FdYXr2jdnVY3b25HdyqVurDce0UdiJEVWuT FbBWEld96+stq0RccRua0Omo4frhYjxzQkjHykm6qYCzciPOlkELMSuXO9VB5HnUZqtX OXLuCvEvc8R2BxgNGtnw/RPAP6roLKr7Ez+WhqbsJn6qI6A/IQixGen1O3K6Wo1656qn lFGwWRH4kCY85TYLbDEGKqqgc1IxyJ8kz3xQ26YuzbBhxi2YnKhHyzF8wi41F/WVa+Ua 4RpPPkrYZcoQCdnxJ9/EDsrDSAMYx78SMC1Q5wsmZWooV5lg7Y6I9svr4rxDZIsRykn1 xcQg== X-Gm-Message-State: ALoCoQlA+/gZ04v2hwug+AGglk3QDVr3yh4aGWFjWemSOKtpyuU3sIcT5MB3ecGjT5AgZpQfCby9yTEWgs6d48QPt1oTPxkMVbJ7GlE+pbtKTxmVi+ss8VbxQNZr8XgwEQXB48BeN6o7 X-Received: by 10.25.138.136 with SMTP id m130mr9710892lfd.2.1447826374106; Tue, 17 Nov 2015 21:59:34 -0800 (PST) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id rm5sm165290lbb.20.2015.11.17.21.59.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Nov 2015 21:59:33 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v3 4/9] ath10k: remove is_offchan Date: Wed, 18 Nov 2015 06:59:18 +0100 Message-Id: <1447826363-16818-5-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447826363-16818-1-git-send-email-michal.kazior@tieto.com> References: <87mvuj585b.fsf@kamboji.qca.qualcomm.com> <1447826363-16818-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=-7.3 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 It was wasteful to keep it in the struct. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.h | 1 - drivers/net/wireless/ath/ath10k/mac.c | 2 -- drivers/net/wireless/ath/ath10k/txrx.c | 7 ++++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 0228000ecf50..89a83e3c5cb6 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -89,7 +89,6 @@ struct ath10k_skb_cb { struct { u8 tid; u16 freq; - bool is_offchan; bool nohwcrypt; struct ath10k_htt_txbuf *txbuf; u32 txbuf_paddr; diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 4d3b8dc8e5de..164a3e5ae6da 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3683,7 +3683,6 @@ static void ath10k_tx(struct ieee80211_hw *hw, txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb); - ATH10K_SKB_CB(skb)->htt.is_offchan = false; ATH10K_SKB_CB(skb)->htt.freq = 0; ATH10K_SKB_CB(skb)->htt.tid = ath10k_tx_h_get_tid(hdr); ATH10K_SKB_CB(skb)->htt.nohwcrypt = !ath10k_tx_h_use_hwcrypto(vif, skb); @@ -3715,7 +3714,6 @@ static void ath10k_tx(struct ieee80211_hw *hw, if (!ath10k_mac_tx_frm_has_freq(ar)) { ATH10K_SKB_CB(skb)->htt.freq = 0; - ATH10K_SKB_CB(skb)->htt.is_offchan = true; ath10k_dbg(ar, ATH10K_DBG_MAC, "queued offchannel skb %p\n", skb); diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 6d1105ab4592..9e14c04ac89f 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -23,7 +23,12 @@ static void ath10k_report_offchan_tx(struct ath10k *ar, struct sk_buff *skb) { - if (!ATH10K_SKB_CB(skb)->htt.is_offchan) + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + + if (likely(!(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN))) + return; + + if (ath10k_mac_tx_frm_has_freq(ar)) return; /* If the original wait_for_completion() timed out before