Skip to content

Commit 2043a14

Browse files
dsahernrleon
authored andcommitted
RDMA: Fix netdev tracker in ib_device_set_netdev
If a netdev has already been assigned, ib_device_set_netdev needs to release the reference on the older netdev but it is mistakenly being called for the new netdev. Fix it and in the process use netdev_put to be symmetrical with the netdev_hold. Fixes: 09f530f ("RDMA: Add netdevice_tracker to ib_device_set_netdev()") Signed-off-by: David Ahern <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Leon Romanovsky <[email protected]>
1 parent bbddfa2 commit 2043a14

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/infiniband/core/device.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,16 +2184,12 @@ int ib_device_set_netdev(struct ib_device *ib_dev, struct net_device *ndev,
21842184
return 0;
21852185
}
21862186

2187-
if (old_ndev)
2188-
netdev_tracker_free(ndev, &pdata->netdev_tracker);
2189-
if (ndev)
2190-
netdev_hold(ndev, &pdata->netdev_tracker, GFP_ATOMIC);
21912187
rcu_assign_pointer(pdata->netdev, ndev);
2188+
netdev_put(old_ndev, &pdata->netdev_tracker);
2189+
netdev_hold(ndev, &pdata->netdev_tracker, GFP_ATOMIC);
21922190
spin_unlock_irqrestore(&pdata->netdev_lock, flags);
21932191

21942192
add_ndev_hash(pdata);
2195-
__dev_put(old_ndev);
2196-
21972193
return 0;
21982194
}
21992195
EXPORT_SYMBOL(ib_device_set_netdev);

0 commit comments

Comments
 (0)