Skip to content

Commit

Permalink
net: dev_replace_track() cleanup
Browse files Browse the repository at this point in the history
Use existing helpers (netdev_tracker_free()
and netdev_tracker_alloc()) to remove ifdefery.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20211214151515.312535-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Eric Dumazet authored and Jakub Kicinski committed Dec 15, 2021
1 parent 123e495 commit 9280ac2
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -3885,16 +3885,14 @@ static inline void dev_replace_track(struct net_device *odev,
netdevice_tracker *tracker,
gfp_t gfp)
{
#ifdef CONFIG_NET_DEV_REFCNT_TRACKER
if (odev)
ref_tracker_free(&odev->refcnt_tracker, tracker);
#endif
netdev_tracker_free(odev, tracker);

dev_hold(ndev);
dev_put(odev);
#ifdef CONFIG_NET_DEV_REFCNT_TRACKER

if (ndev)
ref_tracker_alloc(&ndev->refcnt_tracker, tracker, gfp);
#endif
netdev_tracker_alloc(ndev, tracker, gfp);
}

/* Carrier loss detection, dial on demand. The functions netif_carrier_on
Expand Down

0 comments on commit 9280ac2

Please sign in to comment.