From 3736d44d4260315aa6c1464221339620bc9c89ad Mon Sep 17 00:00:00 2001 From: "Figo.zhang" Date: Mon, 7 Jun 2010 21:13:22 +0000 Subject: [PATCH] --- yaml --- r: 200380 b: refs/heads/master c: 349124a00754129a5f1e43efa84733e364bf3749 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/8139cp.c | 2 +- trunk/drivers/net/8139too.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c6f5d9fecbd..603aab6b5df4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07a0f0f07a68014c92c752a5598102372bddf46e +refs/heads/master: 349124a00754129a5f1e43efa84733e364bf3749 diff --git a/trunk/drivers/net/8139cp.c b/trunk/drivers/net/8139cp.c index 9c149750e2bf..284a5f4a63ac 100644 --- a/trunk/drivers/net/8139cp.c +++ b/trunk/drivers/net/8139cp.c @@ -598,8 +598,8 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 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); } diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c index 80cd074d3817..97d8068b372b 100644 --- a/trunk/drivers/net/8139too.c +++ b/trunk/drivers/net/8139too.c @@ -2089,8 +2089,8 @@ static int rtl8139_poll(struct napi_struct *napi, int budget) * again when we think we are done. */ spin_lock_irqsave(&tp->lock, flags); - RTL_W16_F(IntrMask, rtl8139_intr_mask); __napi_complete(napi); + RTL_W16_F(IntrMask, rtl8139_intr_mask); spin_unlock_irqrestore(&tp->lock, flags); } spin_unlock(&tp->rx_lock);