From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 13 Jun 2006 08:17:29 +0000 (+0900)
Subject: [PATCH] sky2: fix hotplug detect during poll
X-Git-Tag: v2.6.17~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26ec43f132d1cf282124a020b2bb5310496c9132;p=karo-tx-linux.git

[PATCH] sky2: fix hotplug detect during poll

If the poll routine detects no hardware available, it needs to dequeue
it self from the network poll list. Linus didn't understand NAPI.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6ad676d2cbc1..b680e64ad2ca 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2181,7 +2181,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 	u32 status = sky2_read32(hw, B0_Y2_SP_EISR);
 
 	if (!~status)
-		return 0;
+		goto out;
 
 	if (status & Y2_IS_HW_ERR)
 		sky2_hw_intr(hw);
@@ -2219,7 +2219,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 
 	if (sky2_more_work(hw))
 		return 1;
-
+out:
 	netif_rx_complete(dev0);
 
 	sky2_read32(hw, B0_Y2_SP_LISR);