From patchwork Thu Jan 21 13:46:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 8081231 X-Patchwork-Delegate: kvalo@adurom.com 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 2C4A5BEEE5 for ; Thu, 21 Jan 2016 13:46:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E103203A9 for ; Thu, 21 Jan 2016 13:46:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9275220511 for ; Thu, 21 Jan 2016 13:46:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965336AbcAUNqC (ORCPT ); Thu, 21 Jan 2016 08:46:02 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:36133 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965307AbcAUNpw (ORCPT ); Thu, 21 Jan 2016 08:45:52 -0500 Received: by mail-lf0-f46.google.com with SMTP id h129so27136576lfh.3 for ; Thu, 21 Jan 2016 05:45:51 -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=L5Et0cU09dG6RwG5o5L9HDQkRCMCUAtx6wlc0liwJS0=; b=ASaA7P83XHHOurcFa5oqlhUzWrZAOPjlcKJsthVqfNXmOzcBTXk/9iz1rKgOihZoYr YGtXza6Vbsh//fVOSI8kdsdTUH/lVQ7KSLMY69lOuOMClvyXuh0cln8uqfAanY2fYHmd S4mRZ8BfI2GujRtSApzuSoVd5uXLzp9nehrHM= 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=L5Et0cU09dG6RwG5o5L9HDQkRCMCUAtx6wlc0liwJS0=; b=ZZddyHmLLheaIk2VLHvJjeerql3KK8VCs5kcvWyBziXDbtYj1qcG1XECHyGCt3BJuh IIORUZq7o2k9kzJMCPYlfmTQKzSfK/ear9GDL6fmdERtXIck+v7UDOlxW4vdjmgxwhC3 IFTUuwfgpF5qtvB+sFYXMFZxqE0VfC6E8byaOeHNK04zvxQemzBRKzrBAJ7+bOQQvmjc 9lvIH+sj4hoXuBjQ86KNbzPJFRobjjC5+xHrE5C4T0/Tv7x2fqEYcSNQDdG2gl3q+Jam GQBr0nptZJEwPsvqVuTC4DNKR7t1KSfFROMt3CdEinpLKdfnevoAiwZZDiYZYaZnmKak kkKQ== X-Gm-Message-State: ALoCoQlkQTR1Eozdft9oE7AgLg1/3sC362nujwCe+5djhBTcfaxr26RJviE1HlPwlNvVzM23dB8FwrrAANR7gC1k5gdj+GHEgQq6UUvQhWl04MOgfU6rU0rfQsF+qz4thpMfHP81oK5YZrK2RwM7dc/Uk+b2UEQx9w== X-Received: by 10.25.43.212 with SMTP id r203mr15777779lfr.162.1453383951060; Thu, 21 Jan 2016 05:45:51 -0800 (PST) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id c192sm207382lfb.16.2016.01.21.05.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Jan 2016 05:45:50 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 11/13] ath10k: store txq in skb_cb Date: Thu, 21 Jan 2016 14:46:44 +0100 Message-Id: <1453384006-31907-12-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453384006-31907-1-git-send-email-michal.kazior@tieto.com> References: <1453384006-31907-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,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 This will be necessary for later. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 38ed4bbd220b..5be56a8343bd 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -95,6 +95,7 @@ struct ath10k_skb_cb { u8 eid; u16 msdu_id; struct ieee80211_vif *vif; + struct ieee80211_txq *txq; } __packed; struct ath10k_skb_rxcb { diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 42020c22eaed..639da03572e0 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3311,6 +3311,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar, static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar, struct ieee80211_vif *vif, + struct ieee80211_txq *txq, struct sk_buff *skb) { struct ieee80211_hdr *hdr = (void *)skb->data; @@ -3327,6 +3328,7 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar, cb->flags |= ATH10K_SKB_F_QOS; cb->vif = vif; + cb->txq = txq; } bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar) @@ -3660,7 +3662,7 @@ static int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw, return -ENOENT; } - ath10k_mac_tx_h_fill_cb(ar, vif, skb); + ath10k_mac_tx_h_fill_cb(ar, vif, txq, skb); txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb); txpath = ath10k_mac_tx_h_get_txpath(ar, skb, txmode); @@ -3792,6 +3794,27 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) spin_unlock_bh(&ar->htt.tx_lock); } +static void ath10k_mac_txq_unref(struct ath10k *ar, + struct ieee80211_txq *txq) +{ + struct ath10k_skb_cb *cb; + struct sk_buff *msdu; + int msdu_id; + + if (!txq) + return; + + spin_lock_bh(&ar->htt.tx_lock); + + idr_for_each_entry(&ar->htt.pending_tx, msdu, msdu_id) { + cb = ATH10K_SKB_CB(msdu); + if (cb->txq == txq) + cb->txq = NULL; + } + + spin_unlock_bh(&ar->htt.tx_lock); +} + /************/ /* Scanning */ /************/ @@ -3963,6 +3986,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_vif *vif = info->control.vif; struct ieee80211_sta *sta = control->sta; + struct ieee80211_txq *txq = NULL; struct ieee80211_hdr *hdr = (void *)skb->data; enum ath10k_hw_txrx_mode txmode; enum ath10k_mac_tx_path txpath; @@ -3971,7 +3995,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw, bool is_presp; int ret; - ath10k_mac_tx_h_fill_cb(ar, vif, skb); + ath10k_mac_tx_h_fill_cb(ar, vif, txq, skb); txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb); txpath = ath10k_mac_tx_h_get_txpath(ar, skb, txmode); @@ -5010,6 +5034,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, spin_unlock_bh(&ar->data_lock); ath10k_peer_cleanup(ar, arvif->vdev_id); + ath10k_mac_txq_unref(ar, vif->txq); if (vif->type == NL80211_IFTYPE_MONITOR) { ar->monitor_arvif = NULL; @@ -5872,6 +5897,9 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, } spin_unlock_bh(&ar->data_lock); + for (i = 0; i < ARRAY_SIZE(sta->txq); i++) + ath10k_mac_txq_unref(ar, sta->txq[i]); + if (!sta->tdls) goto exit;