diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-21 01:32:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:32:28 -0500 |
commit | 153330618691694af64f39fb56c9de051862380e (patch) | |
tree | 45ccb622bf0d13f6a0a663ba8af39f9dc2c9122e /include/linux | |
parent | 2d0817d11eaec57435feb61493331a763f732a2b (diff) |
[NET]: dev_put/dev_hold cleanup
Get rid of the old __dev_put macro that is just a hold over from pre 2.6
kernel. And turn dev_hold into an inline instead of a macro.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b825be201bce..950dc55e5192 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -712,8 +712,10 @@ static inline void dev_put(struct net_device *dev) | |||
712 | atomic_dec(&dev->refcnt); | 712 | atomic_dec(&dev->refcnt); |
713 | } | 713 | } |
714 | 714 | ||
715 | #define __dev_put(dev) atomic_dec(&(dev)->refcnt) | 715 | static inline void dev_hold(struct net_device *dev) |
716 | #define dev_hold(dev) atomic_inc(&(dev)->refcnt) | 716 | { |
717 | atomic_inc(&dev->refcnt); | ||
718 | } | ||
717 | 719 | ||
718 | /* Carrier loss detection, dial on demand. The functions netif_carrier_on | 720 | /* Carrier loss detection, dial on demand. The functions netif_carrier_on |
719 | * and _off may be called from IRQ context, but it is caller | 721 | * and _off may be called from IRQ context, but it is caller |