From patchwork Thu Feb 20 10:44:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Wetzel X-Patchwork-Id: 13983711 X-Patchwork-Delegate: johannes@sipsolutions.net Received: from ns2.wdyn.eu (ns2.wdyn.eu [5.252.227.236]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 91D021F3FCB for ; Thu, 20 Feb 2025 10:44:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=5.252.227.236 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740048287; cv=none; b=dH3g9gspca37mBAoR/Rt7FDByjuccshrUceRY/UkoINtkmIAMzmjCW4rQteIWV6rexBd7h+cvYqGU0YS2youvRCrfCKWY/6CChXLEW2k47PRt6batD5mDkv3GKfpK/1U8z+DaGHEdoWNpH2/+MiSKUGpaG449/ubzFwn7Jdajhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740048287; c=relaxed/simple; bh=aNSm7Mu/wy9S1gyovVo7Ek0mpfaboW8OKnRRpYUi9Kg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bj9lJ0FicQVaOE8bV5u7dbE32qIhCKps91VKsUnAizh7NuXQTKMusnqaCYdCYQVRyaSh1XpFs7Vqdy/u7+99OcORZFENXALjEAHnHcz2suwbiX3NrKfAbWX5VrnVTq3PKC5hWEn/jlzCzmKjLmC5yLaJf2c3IQ5McfOEB5UtAQI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wetzel-home.de; spf=pass smtp.mailfrom=wetzel-home.de; dkim=pass (1024-bit key) header.d=wetzel-home.de header.i=@wetzel-home.de header.b=OBUjONMA; arc=none smtp.client-ip=5.252.227.236 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wetzel-home.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wetzel-home.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=wetzel-home.de header.i=@wetzel-home.de header.b="OBUjONMA" From: Alexander Wetzel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wetzel-home.de; s=wetzel-home; t=1740048280; bh=aNSm7Mu/wy9S1gyovVo7Ek0mpfaboW8OKnRRpYUi9Kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OBUjONMAqcOIiEL81t5hPNRx0kvnk2EUq7XnXZKSUx1A5XznGy66uYDVZ3et4tfDY aszX2r6Wh7XPkAIFc3dgPkm2A8Dt9X3yTA16twHqpu77s6GQMHjmrv8EbOa5zZiWm0 XuevRhtnrf+7qXn4UXvsGTkxZXeOKMOG5kHpIWqE= To: linux-wireless@vger.kernel.org Cc: Johannes Berg , Alexander Wetzel Subject: [PATCH v3 06/10] wifi: mac80211: Call ieee80211_tx_h_select_key only once Date: Thu, 20 Feb 2025 11:44:22 +0100 Message-ID: <20250220104426.82011-7-Alexander@wetzel-home.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220104426.82011-1-Alexander@wetzel-home.de> References: <20250220104426.82011-1-Alexander@wetzel-home.de> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ieee80211_tx_dequeue() already calls ieee80211_tx_h_select_key() when needed. Move it from invoke_tx_handlers_early() to invoke_tx_handlers() to avoid calling it twice for TXQs. Signed-off-by: Alexander Wetzel --- net/mac80211/tx.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index db66deae69a4..7c269d8e5dcf 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1693,7 +1693,6 @@ static int invoke_tx_handlers_early(struct ieee80211_tx_data *tx) CALL_TXH(ieee80211_tx_h_check_assoc); CALL_TXH(ieee80211_tx_h_ps_buf); CALL_TXH(ieee80211_tx_h_check_control_port_protocol); - CALL_TXH(ieee80211_tx_h_select_key); txh_done: if (unlikely(res == TX_DROP)) { @@ -1761,6 +1760,17 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx) if (r) return r; + + r = ieee80211_tx_h_select_key(tx); + if (unlikely(r != TX_CONTINUE)) { + I802_DEBUG_INC(tx->local->tx_handlers_drop); + if (tx->skb) + ieee80211_free_txskb(&tx->local->hw, tx->skb); + else + ieee80211_purge_tx_queue(&tx->local->hw, &tx->skbs); + return -1; + } + return invoke_tx_handlers_late(tx); }