diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2008-01-23 22:11:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-03 07:28:44 -0500 |
commit | a7bffe722c996679b4fb2103ecaf673ec2b9b4a7 (patch) | |
tree | 7bd687d08e859c29c31d08fb9e8c5ecc4fba01ef /drivers | |
parent | 44911bfee4a92f7580cb4dbba36e986003b0ac75 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sky2.c | 5 |
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) | |||
1422 | imask |= portirq_msk[port]; | 1422 | imask |= portirq_msk[port]; |
1423 | sky2_write32(hw, B0_IMSK, imask); | 1423 | sky2_write32(hw, B0_IMSK, imask); |
1424 | 1424 | ||
1425 | sky2_set_multicast(dev); | ||
1425 | return 0; | 1426 | return 0; |
1426 | 1427 | ||
1427 | err_out: | 1428 | err_out: |
@@ -3554,8 +3555,6 @@ static int sky2_set_ringparam(struct net_device *dev, | |||
3554 | err = sky2_up(dev); | 3555 | err = sky2_up(dev); |
3555 | if (err) | 3556 | if (err) |
3556 | dev_close(dev); | 3557 | dev_close(dev); |
3557 | else | ||
3558 | sky2_set_multicast(dev); | ||
3559 | } | 3558 | } |
3560 | 3559 | ||
3561 | return err; | 3560 | return err; |
@@ -4389,8 +4388,6 @@ static int sky2_resume(struct pci_dev *pdev) | |||
4389 | dev_close(dev); | 4388 | dev_close(dev); |
4390 | goto out; | 4389 | goto out; |
4391 | } | 4390 | } |
4392 | |||
4393 | sky2_set_multicast(dev); | ||
4394 | } | 4391 | } |
4395 | } | 4392 | } |
4396 | 4393 | ||