summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2008-01-24 04:11:51 +0100
committerDavid S. Miller <davem@davemloft.net>2008-02-03 13:28:44 +0100
commita7bffe722c996679b4fb2103ecaf673ec2b9b4a7 (patch)
tree7bd687d08e859c29c31d08fb9e8c5ecc4fba01ef
parentpci-skeleton: Misc fixes to build neatly (diff)
downloadlinux-a7bffe722c996679b4fb2103ecaf673ec2b9b4a7.tar.xz
linux-a7bffe722c996679b4fb2103ecaf673ec2b9b4a7.zip
sky2: restore multicast addresses after recovery
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 <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/sky2.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 626190eb91e7..6675b2256cdb 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1422,6 +1422,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:
@@ -3554,8 +3555,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;
@@ -4389,8 +4388,6 @@ static int sky2_resume(struct pci_dev *pdev)
dev_close(dev);
goto out;
}
-
- sky2_set_multicast(dev);
}
}