Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a6d2ea0 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c010b2f7

drivers/net/sky2.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1829,9 +1829,6 @@ static int sky2_down(struct net_device *dev) 
	if (netif_msg_ifdown(sky2))

	if (netif_msg_ifdown(sky2))

		printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);

		printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);





	/* Stop more packets from being queued */

	netif_stop_queue(dev);



	/* Disable port IRQ */

	/* Disable port IRQ */

	imask = sky2_read32(hw, B0_IMSK);

	imask = sky2_read32(hw, B0_IMSK);

	imask &= ~portirq_msk[port];

	imask &= ~portirq_msk[port];
@@ -1887,8 +1884,6 @@ static int sky2_down(struct net_device *dev) 




	sky2_phy_power_down(hw, port);

	sky2_phy_power_down(hw, port);





	netif_carrier_off(dev);



	/* turn off LED's */

	/* turn off LED's */

	sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);

	sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);