diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2005-12-20 15:08:08 -0800 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:38:35 -0500 |
| commit | 6ed995bb29f042eece8392d9bae0b83f84bcdb23 (patch) | |
| tree | f1ac80aa3da1a9426373d711dd5c0a16f63c959f | |
| parent | [PATCH] sky2: handle out of memory on admin changes (diff) | |
| download | linux-dev-6ed995bb29f042eece8392d9bae0b83f84bcdb23.tar.xz linux-dev-6ed995bb29f042eece8392d9bae0b83f84bcdb23.zip | |
[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>
| -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) | 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; |