diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-07-23 00:53:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-23 00:53:40 -0400 |
commit | 8a6d2ea0cd121e3bfff4dbce5bc111874cf9e9d2 (patch) | |
tree | 46c4d4d65e655a38401c598bcad87305c2d142df /drivers/net/sky2.c | |
parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) |
sky2: don't stop queue on shutdown
It is unnecessary, to stop queue and turn off carrier in shutdown
routine. With new netdev_queue this causes warnings.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 711e4a8948e0..5257cf464f1a 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -1829,9 +1829,6 @@ static int sky2_down(struct net_device *dev) | |||
1829 | if (netif_msg_ifdown(sky2)) | 1829 | if (netif_msg_ifdown(sky2)) |
1830 | printk(KERN_INFO PFX "%s: disabling interface\n", dev->name); | 1830 | printk(KERN_INFO PFX "%s: disabling interface\n", dev->name); |
1831 | 1831 | ||
1832 | /* Stop more packets from being queued */ | ||
1833 | netif_stop_queue(dev); | ||
1834 | |||
1835 | /* Disable port IRQ */ | 1832 | /* Disable port IRQ */ |
1836 | imask = sky2_read32(hw, B0_IMSK); | 1833 | imask = sky2_read32(hw, B0_IMSK); |
1837 | imask &= ~portirq_msk[port]; | 1834 | imask &= ~portirq_msk[port]; |
@@ -1887,8 +1884,6 @@ static int sky2_down(struct net_device *dev) | |||
1887 | 1884 | ||
1888 | sky2_phy_power_down(hw, port); | 1885 | sky2_phy_power_down(hw, port); |
1889 | 1886 | ||
1890 | netif_carrier_off(dev); | ||
1891 | |||
1892 | /* turn off LED's */ | 1887 | /* turn off LED's */ |
1893 | sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); | 1888 | sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); |
1894 | 1889 | ||