From nobody Thu Apr 2 10:59:15 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C88902A1BF; Mon, 30 Mar 2026 01:26:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774833991; cv=none; b=obebnQa4lfH6VDwo8atV+gCmSxSpqmgnaeH1ZHVaGG3RGbooCMXqQMWjcUqe0kEuWPflu3r2mCOxPivJFNy2cjo+fgeqJP8XesMY0Y8Mpw8InrUqTzdRNxhQFnOeMA6L3pftPmbQ6qJ0D0y4o6VGkR09DdCOtt0M65DhEIWYbLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774833991; c=relaxed/simple; bh=wT2UVtUD+FzdeytrPKDW89Pr3r5RuBIpKKP5TxeAYwA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=UzwGo5pbU/smh6LSm4IZpWOpuYYYcUewoqDNY5g0SKmXAbFCTzV6tVNTU6LHNhICzuhATwr5cu0plCDJMAA0OeyW/Sj4Vc7LB7ki0/ojXFrSTfd/T37G6hpmzdAQjepV5u+G85DAXymUGdwo/Wn0EI1+5+AHzN7BvwIB4THk+Z4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.223]) by APP-01 (Coremail) with SMTP id qwCowACXQm4+0clpfEGWCw--.29266S2; Mon, 30 Mar 2026 09:26:23 +0800 (CST) From: Haoxiang Li To: miriam.rachel.korenblit@intel.com, johannes.berg@intel.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li Subject: [PATCH] iwlwifi: dvm: add missing cleaup for on error path Date: Mon, 30 Mar 2026 09:26:20 +0800 Message-Id: <20260330012620.2715796-1-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qwCowACXQm4+0clpfEGWCw--.29266S2 X-Coremail-Antispam: 1UD129KBjvdXoW7GFyUCr43Gr17ur43tw45GFg_yoWkKFX_Kw 1Fq3ZxW34YkrnYvrWDC3y3Z3s0y34DWw4xurWktryfAay7JrW8CrsYyrnxArZ7urW0ka4x Jrn8Ar97A3sxXjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbckFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Jr0_ Gr1l84ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Jr0_Gr 1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0 cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8Jw ACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_JF0_ Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxV WUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI 7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r 1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI 42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x0JUSNtxUUUUU= X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiDAgCE2nJxekt6wAAsf Content-Type: text/plain; charset="utf-8" In iwlagn_tx_agg_start(), call iwlagn_dealloc_agg_txq() to clear bit on error paths. Signed-off-by: Haoxiang Li --- drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c b/drivers/net/wire= less/intel/iwlwifi/dvm/tx.c index a7806776a51e..8357bcf0d05e 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c @@ -604,8 +604,10 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct = ieee80211_vif *vif, } =20 ret =3D iwl_sta_tx_modify_enable_tid(priv, sta_id, tid); - if (ret) + if (ret) { + iwlagn_dealloc_agg_txq(priv, txq_id); return ret; + } =20 spin_lock_bh(&priv->sta_lock); tid_data =3D &priv->tid_data[sta_id][tid]; @@ -624,6 +626,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct i= eee80211_vif *vif, "next_reclaimed =3D %d\n", tid_data->agg.ssn, tid_data->next_reclaimed); + iwlagn_dealloc_agg_txq(priv, txq_id); tid_data->agg.state =3D IWL_EMPTYING_HW_QUEUE_ADDBA; } spin_unlock_bh(&priv->sta_lock); --=20 2.25.1