[PATCH] sky2: netpoll on dual port cards
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>
This commit is contained in:
parent
798b6b19d7
commit
0ca43235b3
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue