diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-05-14 15:38:14 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-05-17 20:43:14 -0400 |
commit | 84787e3fc38a4847e5d75388d5a7fb3cf6bd7834 (patch) | |
tree | 1498b6a8a6c59186f909542b4493d327b4897118 /drivers/net | |
parent | a3caeada948535f126e407457e15f2633ee7168a (diff) |
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 <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | 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 6e360f816605..ccbd8c2674b0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -1579,13 +1579,6 @@ static int sky2_down(struct net_device *dev) | |||
1579 | imask &= ~portirq_msk[port]; | 1579 | imask &= ~portirq_msk[port]; |
1580 | sky2_write32(hw, B0_IMSK, imask); | 1580 | sky2_write32(hw, B0_IMSK, imask); |
1581 | 1581 | ||
1582 | /* | ||
1583 | * Both ports share the NAPI poll on port 0, so if necessary undo the | ||
1584 | * the disable that is done in dev_close. | ||
1585 | */ | ||
1586 | if (sky2->port == 0 && hw->ports > 1) | ||
1587 | netif_poll_enable(dev); | ||
1588 | |||
1589 | sky2_gmac_reset(hw, port); | 1582 | sky2_gmac_reset(hw, port); |
1590 | 1583 | ||
1591 | /* Stop transmitter */ | 1584 | /* Stop transmitter */ |