diff options
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 1d183d5177a1..c7b4da1d717f 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -1478,8 +1478,6 @@ static void sky2_link_down(struct sky2_port *sky2) | |||
1478 | | PHY_M_AN_ASP); | 1478 | | PHY_M_AN_ASP); |
1479 | } | 1479 | } |
1480 | 1480 | ||
1481 | sky2_phy_reset(hw, port); | ||
1482 | |||
1483 | netif_carrier_off(sky2->netdev); | 1481 | netif_carrier_off(sky2->netdev); |
1484 | netif_stop_queue(sky2->netdev); | 1482 | netif_stop_queue(sky2->netdev); |
1485 | 1483 | ||
@@ -2833,6 +2831,8 @@ static int sky2_set_ringparam(struct net_device *dev, | |||
2833 | err = sky2_up(dev); | 2831 | err = sky2_up(dev); |
2834 | if (err) | 2832 | if (err) |
2835 | dev_close(dev); | 2833 | dev_close(dev); |
2834 | else | ||
2835 | sky2_set_multicast(dev); | ||
2836 | } | 2836 | } |
2837 | 2837 | ||
2838 | return err; | 2838 | return err; |