From 0805b8124b1314647f00171f6037809e24c325a0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 28 Oct 2010 09:54:23 -0700 Subject: [PATCH] --- yaml --- r: 220450 b: refs/heads/master c: eebfc6055aba312f8b620a58fe1c23471cdcd149 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Bcmnet.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 276a19199b48..ea34507e3f40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bceadddd92ceb4fd51e5e16c4f6699d8eb2e5604 +refs/heads/master: eebfc6055aba312f8b620a58fe1c23471cdcd149 diff --git a/trunk/drivers/staging/bcm/Bcmnet.c b/trunk/drivers/staging/bcm/Bcmnet.c index bb9260c6845e..bc2969821421 100644 --- a/trunk/drivers/staging/bcm/Bcmnet.c +++ b/trunk/drivers/staging/bcm/Bcmnet.c @@ -22,17 +22,15 @@ static INT bcm_notify_event(struct notifier_block *nb, ULONG event, PVOID dev) case NETDEV_REGISTER: /* Increment the Reference Count for "veth0" */ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Register RefCount: %x\n", - atomic_read(&ndev->refcnt)); - atomic_inc(&ndev->refcnt); + netdev_refcnt_read(ndev)); + dev_hold(ndev); break; case NETDEV_UNREGISTER: /* Decrement the Reference Count for "veth0" */ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregister RefCnt: %x\n", - atomic_read(&ndev->refcnt)); - atomic_dec(&ndev->refcnt); - if((int)atomic_read(&ndev->refcnt) < 0) - atomic_set(&ndev->refcnt, 0); + netdev_refcnt_read(ndev)); + dev_put(ndev); break; }; }