[patch 29/45] sky2: restore multicast addresses after recovery

Greg KH
2008-02-07T21:05:41Z

[-- Attachment #1: sky2-restore-multicast-addresses-after-recovery.patch --]
[-- Type: text/plain, Size: 1180 bytes --]

2.6.24-stable review patch. If anyone has any objections, please let us know.

------------------
From: Stephen Hemminger <shemminger@linux-foundation.org>

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 <shemminger@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
drivers/net/sky2.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1412,6 +1412,7 @@ static int sky2_up(struct net_device *de
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
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 *p
dev_close(dev);
goto out;
}
-
- sky2_set_multicast(dev);
}
}

--