From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63E8C139579; Tue, 27 May 2025 17:09:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365780; cv=none; b=bg9Re7C/p9sYLH/v1yes6aDlEiuw1LALmaP3FhVg7TNdJLH8qTFFeNWbz6UwaLut3ncibB+xqn3xKbobwGtCkLeoBDzJgPj76cNaw1hEZO9/2jEy3/j9h3B2bR9iATR8sLPrJh+22rhe0PuwXe9tF0OoFyF1Pi5iUngjmH/6vJg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365780; c=relaxed/simple; bh=ztRqFNM66gXJx/UwTPNSbkbuwi0OBzdF5EfIkADsS3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nuYko4T2CA9sJBEJQbJEpRNCb70Jf6vbuOiWcKHrXgRBZC6N3nMzfiRsHzx9IYyvxBhS93ZJbMNYObUx4rr/aHyWguQkP2eaS6YIhn/CZGY74Xtzs8y3cvF1kFu8iJUF6dvTI1G6Vx6rk9jxHVMzXgOaWpCZ3/JLcDn8S5Crkxo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZTOazUle; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZTOazUle" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7C49C4CEE9; Tue, 27 May 2025 17:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365780; bh=ztRqFNM66gXJx/UwTPNSbkbuwi0OBzdF5EfIkADsS3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZTOazUle11LpD5F1jlGxNRXyn2y2ecQ9fj0D7hdwKh/AVWZ++yuV1p8iXkP3fzoMf fNU5PDpvrT9OuHWcsqbjp877OqXqRBxz8njnd7f5Kyq+eF/9FjdcZhW10f1+vJ6Rh/ Fe/5wyQRM4qxDOHR9I2W9bO1gBpTO4cUyyjyyCXo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nicolas Escande , Vasanthakumar Thiagarajan , Jeff Johnson , Sasha Levin Subject: [PATCH 6.12 487/626] wifi: ath12k: fix ath12k_hal_tx_cmd_ext_desc_setup() info1 override Date: Tue, 27 May 2025 18:26:20 +0200 Message-ID: <20250527162504.768715204@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicolas Escande [ Upstream commit df11edfba49e5fb69f4c9e7cb76082b89c417f78 ] Since inception there is an obvious typo laying around in ath12k_hal_tx_cmd_ext_desc_setup(). Instead of initializing + adding flags to tcl_ext_cmd->info1, we initialize + override. This will be needed in the future to make broadcast frames work with ethernet encapsulation. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Signed-off-by: Nicolas Escande Reviewed-by: Vasanthakumar Thiagarajan Link: https://patch.msgid.link/20250127071306.1454699-1-nico.escande@gmail.com Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c index ad21fbfbcbe22..201ffdb8c44ae 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -117,7 +117,7 @@ static void ath12k_hal_tx_cmd_ext_desc_setup(struct ath12k_base *ab, le32_encode_bits(ti->data_len, HAL_TX_MSDU_EXT_INFO1_BUF_LEN); - tcl_ext_cmd->info1 = le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) | + tcl_ext_cmd->info1 |= le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) | le32_encode_bits(ti->encap_type, HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE) | le32_encode_bits(ti->encrypt_type, -- 2.39.5