From: Adam Edvardsson <adam.edvardsson@orsoc.se>
Date: Thu, 25 Nov 2010 02:30:27 +0000 (+0000)
Subject: ethoc: enable interrupts after napi_complete
X-Git-Tag: v2.6.38-rc1~476^2~433
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=7438a5455734d109fdf18d97147dc57a6dbe5a44;hp=eac0d3ff5a92de410964fdf0d072314821ca39fc;p=~andy%2Flinux

ethoc: enable interrupts after napi_complete

Occasionally, it seems that some race is causing the interrupts to not be
reenabled otherwise with the end result that networking just stops working.
Enabling interrupts after calling napi_complete is more in line with what
other drivers do.

Signed-off-by: Jonas Bonn <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index e9e712e0f92..db444a73e4b 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -569,8 +569,8 @@ static int ethoc_poll(struct napi_struct *napi, int budget)
 
 	work_done = ethoc_rx(priv->netdev, budget);
 	if (work_done < budget) {
-		ethoc_enable_irq(priv, INT_MASK_RX);
 		napi_complete(napi);
+		ethoc_enable_irq(priv, INT_MASK_RX);
 	}
 
 	return work_done;