mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
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>
This commit is contained in:
parent
44911bfee4
commit
a7bffe722c
1 changed files with 1 additions and 4 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue