The patch titled
sky2: restore multicast list on resume and other ops
has been removed from the -mm tree. Its filename was
sky2-restore-multicast-list-on-resume-and-other-ops.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: sky2: restore multicast list on resume and other ops
From: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Need to restore multicast settings on resume and after 'ethtool -r'.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Cc: Timo Weingrtner <timo@xxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/sky2.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff -puN drivers/net/sky2.c~sky2-restore-multicast-list-on-resume-and-other-ops drivers/net/sky2.c
--- a/drivers/net/sky2.c~sky2-restore-multicast-list-on-resume-and-other-ops
+++ a/drivers/net/sky2.c
@@ -154,6 +154,8 @@ static const char *yukon2_name[] = {
"FE+", /* 0xb8 */
};
+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)
{
@@ -2943,8 +2945,10 @@ static int sky2_set_settings(struct net_
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;
}
@@ -3037,6 +3041,7 @@ static int sky2_nway_reset(struct net_de
return -EINVAL;
sky2_phy_reinit(sky2);
+ sky2_set_multicast(dev);
return 0;
}
@@ -4207,6 +4212,8 @@ static int sky2_resume(struct pci_dev *p
dev_close(dev);
goto out;
}
+
+ sky2_set_multicast(dev);
}
}
_
Patches currently in -mm which might be from shemminger@xxxxxxxxxxxxxxxxxxxx are
origin.patch
git-infiniband.patch
git-input.patch
git-net.patch
pci-x-pci-express-read-control-interfaces-e1000.patch
export-reciprocal_value-for-modules.patch
sky2-avoid-divide-in-receive-path.patch
sky2-118.patch
skge-remove-broken-and-unused-phy_m_pc_mdi_xmode-macro.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
