summaryrefslogtreecommitdiff
path: root/drivers/net/8139cp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-06-11 13:32:31 -0700
committerDavid S. Miller <davem@davemloft.net>2010-06-11 13:32:31 -0700
commit62522d36d74a843e78d17f2dffc90468c6762803 (patch)
treed9d21de6724425c1b0ba12991e0865556aeda6b4 /drivers/net/8139cp.c
parenta71fba97295db924c0b90266e9833e5059fead24 (diff)
parente79aa8671033535c2e9ffc0a68010ae49ed5734c (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/8139cp.c')
-rw-r--r--drivers/net/8139cp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index e949ba80127d..4a4f6b81e32d 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -598,8 +598,8 @@ rx_next:
goto rx_status_loop;
spin_lock_irqsave(&cp->lock, flags);
- cpw16_f(IntrMask, cp_intr_mask);
__napi_complete(napi);
+ cpw16_f(IntrMask, cp_intr_mask);
spin_unlock_irqrestore(&cp->lock, flags);
}