From 31d722ee25d1b8139259483f8ab14c188ca52b2e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 24 Jan 2008 19:44:50 -0800 Subject: [PATCH] sky2: restore multicast addresses after recovery patch a7bffe722c996679b4fb2103ecaf673ec2b9b4a7 in mainline. If the sky2 deadman timer forces a recovery, the multicast hash list is lost. Move the call to sky2_set_multicast to the end of sky2_up() so all paths that bring device up will restore multicast. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman --- drivers/net/sky2.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index bc15940ce1bc..a91fcb6a978f 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1412,6 +1412,7 @@ static int sky2_up(struct net_device *dev) imask |= portirq_msk[port]; sky2_write32(hw, B0_IMSK, imask); + sky2_set_multicast(dev); return 0; err_out: @@ -3533,8 +3534,6 @@ 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; @@ -4368,8 +4367,6 @@ static int sky2_resume(struct pci_dev *pdev) dev_close(dev); goto out; } - - sky2_set_multicast(dev); } } -- 2.39.5