Commit 6ed995bb authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] sky2: don't lose multicast addresses 



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

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 1b537565

drivers/net/sky2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1478,8 +1478,6 @@ static void sky2_link_down(struct sky2_port *sky2) 
			     | PHY_M_AN_ASP);

			     | PHY_M_AN_ASP);

	}

	}





	sky2_phy_reset(hw, port);



	netif_carrier_off(sky2->netdev);

	netif_carrier_off(sky2->netdev);

	netif_stop_queue(sky2->netdev);

	netif_stop_queue(sky2->netdev);
@@ -2833,6 +2831,8 @@ static int sky2_set_ringparam(struct net_device *dev, 
		err = sky2_up(dev);

		err = sky2_up(dev);

		if (err)

		if (err)

			dev_close(dev);

			dev_close(dev);

		else

			sky2_set_multicast(dev);

	}

	}





	return err;

	return err;