[PATCH net-next] net: dev_replace_track() cleanup
From: Eric Dumazet <hidden>
Date: 2021-12-14 15:15:22
From: Eric Dumazet <redacted> Use existing helpers (netdev_tracker_free() and netdev_tracker_alloc()) to remove ifdefery. Signed-off-by: Eric Dumazet <redacted> --- include/linux/netdevice.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 0ed0a6f0d69d3565c1db9203040838801cd71e99..a419718612c6f82530d67a4540cc86c4bf326f98 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h@@ -3886,16 +3886,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
--
2.34.1.173.g76aa8bc2d0-goog