]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: thunderbolt: Fix the parameter passing of tb_xdomain_enable_paths()/tb_xdomain_d...
authorzhangjianrong <zhangjianrong5@huawei.com>
Sat, 28 Jun 2025 09:49:20 +0000 (17:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:25:57 +0000 (16:25 +0200)
[ 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

index 6b184f6b7273618624082c6206297965bb2470f4..ef13aa36e55e8dba86faf725719c96e6c186fb77 100644 (file)
@@ -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;