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 5BE2B1DC997; Mon, 18 Aug 2025 13:29:19 +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=1755523759; cv=none; b=qtopwspLxSegKrGc/gvEVcTV0Q8o1jm9FisVcugRc3LtYvcg7ldRU4QdwPigoFxMaFdZhqiF9K26xaHSQJxG/DgIotcB6hI6mztwQ+9UYLyVadxo6ZfmNDQTZxfRj8E4Le2A3EvmLDoKdkvkzrv3RzkInT3fbf6SiJ0KZ4Vs9UM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523759; c=relaxed/simple; bh=Glq7hmgM82MC2wMjDyXJT90dVGxTaPCH2yXSKU2etf8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hpgzOLW6QxR2iQNKHAXDB2wvwWr3bjgWiQ9ZF350ybHirWh6auRdY2zE4grZP9d82p2trgOMTRSha1e/VPrkMXjkLBousbt4jB2upWZJEHk1azfvVcGkQmIxxlqlKEgko/uw55wtGbvZG2kNoN4WHvTvLziyNkq9W00iNRVfOKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Kf1oNU+u; 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="Kf1oNU+u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFB58C116B1; Mon, 18 Aug 2025 13:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523759; bh=Glq7hmgM82MC2wMjDyXJT90dVGxTaPCH2yXSKU2etf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kf1oNU+uQevvsVsVQ+VYDqSOtiCI6Eh6QpxJiyIifrbAXhx7TBc2IlBKWwadSF377 3VaOJgyKQnXxEVob8Q93Um8kONf+du7vy5vvMtcWLmtQ8ea0XMZtbyopDJQt+tHeBX 0bGlK98xU5OV+7dMJUpuSCoveSUUCd8KHJC08ucM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mika Westerberg , zhangjianrong , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.15 265/515] net: thunderbolt: Fix the parameter passing of tb_xdomain_enable_paths()/tb_xdomain_disable_paths() Date: Mon, 18 Aug 2025 14:44:11 +0200 Message-ID: <20250818124508.624341741@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: zhangjianrong [ Upstream commit 8ec31cb17cd355cea25cdb8496d9b3fbf1321647 ] According to the description of tb_xdomain_enable_paths(), the third parameter represents the transmit ring and the fifth parameter represents the receive ring. tb_xdomain_disable_paths() is the same case. [Jakub] Mika says: it works now because both rings ->hop is the same Acked-by: Mika Westerberg Link: https://lore.kernel.org/20250625051149.GD2824380@black.fi.intel.com Signed-off-by: zhangjianrong Link: https://patch.msgid.link/20250628094920.656658-1-zhangjianrong5@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/thunderbolt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/thunderbolt/main.c b/drivers/net/thunderbolt/main.c index 643cf67840b5..dcaa62377808 100644 --- a/drivers/net/thunderbolt/main.c +++ b/drivers/net/thunderbolt/main.c @@ -396,9 +396,9 @@ static void tbnet_tear_down(struct tbnet *net, bool send_logout) ret = tb_xdomain_disable_paths(net->xd, net->local_transmit_path, - net->rx_ring.ring->hop, + net->tx_ring.ring->hop, net->remote_transmit_path, - net->tx_ring.ring->hop); + net->rx_ring.ring->hop); if (ret) netdev_warn(net->dev, "failed to disable DMA paths\n"); @@ -662,9 +662,9 @@ static void tbnet_connected_work(struct work_struct *work) goto err_free_rx_buffers; ret = tb_xdomain_enable_paths(net->xd, net->local_transmit_path, - net->rx_ring.ring->hop, + net->tx_ring.ring->hop, net->remote_transmit_path, - net->tx_ring.ring->hop); + net->rx_ring.ring->hop); if (ret) { netdev_err(net->dev, "failed to enable DMA paths\n"); goto err_free_tx_buffers; -- 2.39.5