From b1048e1dd963fa2c11bb625265dc3b0bff7b3a37 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 20 Dec 2005 15:08:08 -0800
Subject: [PATCH] --- yaml --- r: 15832 b: refs/heads/master c:
 6ed995bb29f042eece8392d9bae0b83f84bcdb23 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a8dfd7caaf04..edb95bbdc693 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b537565a85cbe5cc9d5174d348a9014381af718
+refs/heads/master: 6ed995bb29f042eece8392d9bae0b83f84bcdb23
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 1d183d5177a1..c7b4da1d717f 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1478,8 +1478,6 @@ static void sky2_link_down(struct sky2_port *sky2)
 			     | PHY_M_AN_ASP);
 	}
 
-	sky2_phy_reset(hw, port);
-
 	netif_carrier_off(sky2->netdev);
 	netif_stop_queue(sky2->netdev);
 
@@ -2833,6 +2831,8 @@ static int sky2_set_ringparam(struct net_device *dev,
 		err = sky2_up(dev);
 		if (err)
 			dev_close(dev);
+		else
+			sky2_set_multicast(dev);
 	}
 
 	return err;