This workaround was added to deal with NAPI core and how it affected dual port shared polling. It turned out not to be necessary, the core code in dev_stop() waits for NAPI but doesn't kill it. Signed-off-by: Stephen Hemminger --- drivers/net/sky2.c | 7 ------- 1 file changed, 7 deletions(-) --- sky2-2.6.21.orig/drivers/net/sky2.c 2007-05-08 10:28:54.000000000 -0700 +++ sky2-2.6.21/drivers/net/sky2.c 2007-05-08 10:28:58.000000000 -0700 @@ -1570,13 +1570,6 @@ static int sky2_down(struct net_device * imask &= ~portirq_msk[port]; sky2_write32(hw, B0_IMSK, imask); - /* - * Both ports share the NAPI poll on port 0, so if necessary undo the - * the disable that is done in dev_close. - */ - if (sky2->port == 0 && hw->ports > 1) - netif_poll_enable(dev); - sky2_gmac_reset(hw, port); /* Stop transmitter */ -- - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html