Commit 26ec43f1 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f05267e7
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment