---

yaml --- r: 15832 b: refs/heads/master c: 6ed995b h: refs/heads/master v: v3
git-mirror · Dec 24, 2005 · b1048e1 · b1048e1
1 parent a329f5b
commit b1048e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;