diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2008-01-24 19:44:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 11:46:26 -0800 |
| commit | 31d722ee25d1b8139259483f8ab14c188ca52b2e (patch) | |
| tree | bef673bf96371f487f67fcaa2b1b4ea976a0c244 | |
| parent | de0d21fac3d694b3d87a61557d561fb23b56679a (diff) | |
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 <shemminger@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 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); } } |