From: Stephen Hemminger <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/net/e1000/e1000_main.c | 2 +-
include/linux/netdevice.h | 6 ++++--
net/ipv4/igmp.c | 2 +-
net/ipv4/ipmr.c | 4 ++--
net/sched/sch_generic.c | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff -puN drivers/net/e1000/e1000_main.c~dev_put-dev_hold-cleanup
drivers/net/e1000/e1000_main.c
--- devel/drivers/net/e1000/e1000_main.c~dev_put-dev_hold-cleanup
2006-03-08 00:09:38.000000000 -0800
+++ devel-akpm/drivers/net/e1000/e1000_main.c 2006-03-08 00:09:38.000000000
-0800
@@ -920,7 +920,7 @@ e1000_remove(struct pci_dev *pdev)
unregister_netdev(netdev);
#ifdef CONFIG_E1000_NAPI
for (i = 0; i < adapter->num_rx_queues; i++)
- __dev_put(&adapter->polling_netdev[i]);
+ dev_put(&adapter->polling_netdev[i]);
#endif
if (!e1000_check_phy_reset_block(&adapter->hw))
diff -puN include/linux/netdevice.h~dev_put-dev_hold-cleanup
include/linux/netdevice.h
--- devel/include/linux/netdevice.h~dev_put-dev_hold-cleanup 2006-03-08
00:09:38.000000000 -0800
+++ devel-akpm/include/linux/netdevice.h 2006-03-08 00:09:38.000000000
-0800
@@ -712,8 +712,10 @@ static inline void dev_put(struct net_de
atomic_dec(&dev->refcnt);
}
-#define __dev_put(dev) atomic_dec(&(dev)->refcnt)
-#define dev_hold(dev) atomic_inc(&(dev)->refcnt)
+static inline void dev_hold(struct net_device *dev)
+{
+ atomic_inc(&dev->refcnt);
+}
/* Carrier loss detection, dial on demand. The functions netif_carrier_on
* and _off may be called from IRQ context, but it is caller
diff -puN net/ipv4/igmp.c~dev_put-dev_hold-cleanup net/ipv4/igmp.c
--- devel/net/ipv4/igmp.c~dev_put-dev_hold-cleanup 2006-03-08
00:09:38.000000000 -0800
+++ devel-akpm/net/ipv4/igmp.c 2006-03-08 00:09:38.000000000 -0800
@@ -1382,7 +1382,7 @@ static struct in_device * ip_mc_find_dev
dev = ip_dev_find(imr->imr_address.s_addr);
if (!dev)
return NULL;
- __dev_put(dev);
+ dev_put(dev);
}
if (!dev && !ip_route_output_key(&rt, &fl)) {
diff -puN net/ipv4/ipmr.c~dev_put-dev_hold-cleanup net/ipv4/ipmr.c
--- devel/net/ipv4/ipmr.c~dev_put-dev_hold-cleanup 2006-03-08
00:09:38.000000000 -0800
+++ devel-akpm/net/ipv4/ipmr.c 2006-03-08 00:09:38.000000000 -0800
@@ -415,10 +415,10 @@ static int vif_add(struct vifctl *vifc,
return -ENOBUFS;
break;
case 0:
- dev=ip_dev_find(vifc->vifc_lcl_addr.s_addr);
+ dev = ip_dev_find(vifc->vifc_lcl_addr.s_addr);
if (!dev)
return -EADDRNOTAVAIL;
- __dev_put(dev);
+ dev_put(dev);
break;
default:
return -EINVAL;
diff -puN net/sched/sch_generic.c~dev_put-dev_hold-cleanup
net/sched/sch_generic.c
--- devel/net/sched/sch_generic.c~dev_put-dev_hold-cleanup 2006-03-08
00:09:38.000000000 -0800
+++ devel-akpm/net/sched/sch_generic.c 2006-03-08 00:09:38.000000000 -0800
@@ -234,7 +234,7 @@ static void dev_watchdog_down(struct net
{
spin_lock_bh(&dev->xmit_lock);
if (del_timer(&dev->watchdog_timer))
- __dev_put(dev);
+ dev_put(dev);
spin_unlock_bh(&dev->xmit_lock);
}
_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
