diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-09-05 16:56:19 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-09-13 00:02:49 -0400 |
| commit | d1b139c039704c391ab47c6c9540c28f7fcaa489 (patch) | |
| tree | 4d92c3167d85903202aa75a8f522901afa5585fe | |
| parent | 5f08e46b621a769e52a9545a23ab1d5fb2aec1d4 (diff) | |
| download | blackbird-op-linux-d1b139c039704c391ab47c6c9540c28f7fcaa489.tar.gz blackbird-op-linux-d1b139c039704c391ab47c6c9540c28f7fcaa489.zip | |
sky2: restore multicast list on resume and other ops
Need to restore multicast settings on resume and after 'ethtool -r'.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/sky2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index e6d937ec6886..5d812de65d90 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -149,6 +149,8 @@ static const char *yukon2_name[] = { "FE", /* 0xb7 */ }; +static void sky2_set_multicast(struct net_device *dev); + /* Access to external PHY */ static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val) { @@ -2900,8 +2902,10 @@ static int sky2_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) sky2->autoneg = ecmd->autoneg; sky2->advertising = ecmd->advertising; - if (netif_running(dev)) + if (netif_running(dev)) { sky2_phy_reinit(sky2); + sky2_set_multicast(dev); + } return 0; } @@ -2994,6 +2998,7 @@ static int sky2_nway_reset(struct net_device *dev) return -EINVAL; sky2_phy_reinit(sky2); + sky2_set_multicast(dev); return 0; } @@ -4171,6 +4176,8 @@ static int sky2_resume(struct pci_dev *pdev) dev_close(dev); goto out; } + + sky2_set_multicast(dev); } } |
