projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
123e495
)
net: dev_replace_track() cleanup
author
Eric Dumazet
<edumazet@google.com>
Tue, 14 Dec 2021 15:15:15 +0000
(07:15 -0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Wed, 15 Dec 2021 02:46:05 +0000
(18:46 -0800)
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>
include/linux/netdevice.h
patch
|
blob
|
blame
|
history
diff --git
a/include/linux/netdevice.h
b/include/linux/netdevice.h
index 235d5d082f1a446c8d898ffcc5b1983df7c04f35..c06e9dc1a317958ae1fcf749e911432d39dbbe30 100644
(file)
--- a/
include/linux/netdevice.h
+++ b/
include/linux/netdevice.h
@@
-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