[PATCH] sky2: don't lose multicast addresses

Don't lose multicast addresses when link goes down or ring
parameters change.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 1d183d5177a1cbd2346314d5746baba58bd5380b..c7b4da1d717f11d0fd518c295bf9a6715f621a6a 100644 (file)
--- a/drivers/net/sky2.c
+++ b/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;