Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=84787e3fc38a4847e5d75388d5a7fb3cf6bd7834
Commit:     84787e3fc38a4847e5d75388d5a7fb3cf6bd7834
Parent:     a3caeada948535f126e407457e15f2633ee7168a
Author:     Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Mon May 14 12:38:14 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Thu May 17 20:43:14 2007 -0400

    sky2: remove dual port workaround
    
    This workaround was added to deal with NAPI core and how
    it affected dual port shared polling. It turned out not to
    be necessary. Stopping device 0 only doesn't stop NAPI from
    working completely after that.
    
    Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/sky2.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6e360f8..ccbd8c2 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1579,13 +1579,6 @@ 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

Reply via email to