Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=25d82d7a2fc20cc4be414d738139594dc0adf179 Commit: 25d82d7a2fc20cc4be414d738139594dc0adf179 Parent: ce9f7fe3c3f5b9ed1d3e91db78c45d0df5672816 Author: Stephen Hemminger <[EMAIL PROTECTED]> AuthorDate: Wed Dec 20 13:06:33 2006 -0800 Committer: Jeff Garzik <[EMAIL PROTECTED]> CommitDate: Tue Dec 26 16:36:42 2006 -0500
sky2: dual port NAPI problem Shutting down port 0 disables the NAPI poll used by both ports. The long term fix will be to separate NAPI object from net device until then just reenable if needed. Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]> Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]> --- drivers/net/sky2.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index fb1d2c3..4fb3db9 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1511,6 +1511,13 @@ static int sky2_down(struct net_device *dev) 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 git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html