Skip to content

Commit

Permalink
[PATCH] sky2: netpoll on dual port cards
Browse files Browse the repository at this point in the history
The sky2 driver uses a single NAPI poll routine for both ports on dual ported
cards (because there is a single IRQ and status ring). Netpoll makes assumptions
about the relationship between network device and NAPI that aren't correct
on the second port, this will cause the port to never clear work.

Most systems, just have single port, so not a big issue.
The easy fix is just make the second port, not netpoll capable.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Nov 1, 2006
1 parent 798b6b1 commit 0ca4323
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -3238,7 +3238,11 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
dev->poll = sky2_poll;
dev->weight = NAPI_WEIGHT;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = sky2_netpoll;
/* Network console (only works on port 0)
* because netpoll makes assumptions about NAPI
*/
if (port == 0)
dev->poll_controller = sky2_netpoll;
#endif

sky2 = netdev_priv(dev);
Expand Down

0 comments on commit 0ca4323

Please sign in to comment.