| From 9a7404e9900eb8eeacd464abb8eef38281abdcc7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 28 Jun 2025 17:49:20 +0800 |
| Subject: net: thunderbolt: Fix the parameter passing of |
| tb_xdomain_enable_paths()/tb_xdomain_disable_paths() |
| |
| From: zhangjianrong <zhangjianrong5@huawei.com> |
| |
| [ 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 <mika.westerberg@linux.intel.com> |
| Link: https://lore.kernel.org/20250625051149.GD2824380@black.fi.intel.com |
| Signed-off-by: zhangjianrong <zhangjianrong5@huawei.com> |
| Link: https://patch.msgid.link/20250628094920.656658-1-zhangjianrong5@huawei.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/thunderbolt.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c |
| index 6b184f6b7273..ef13aa36e55e 100644 |
| --- a/drivers/net/thunderbolt.c |
| +++ b/drivers/net/thunderbolt.c |
| @@ -386,9 +386,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"); |
| |
| @@ -637,9 +637,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 |
| |
