summaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-12-01 11:41:08 -0800
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:22:29 -0500
commit758140900a82e3ed3bb2be1d4705dd352fe44825 (patch)
tree00c1c439223f7b00dcbbca0bc5f47d61ac48d706 /drivers/net/skge.c
parentf789dfdc44d5bbc04fb7f06e1e4eb682169acaaf (diff)
downloadlinux-758140900a82e3ed3bb2be1d4705dd352fe44825.tar.bz2
[PATCH] skge: don't clear MC state on link down
I would rather fix Andy's problem by not clearing multicast information on link down. Also, add code to restore multicast state after ethtool phy reset. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index b2949035f66a..010fc6541122 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2154,8 +2154,6 @@ static void yukon_link_down(struct skge_port *skge)
int port = skge->port;
u16 ctrl;
- gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
-
ctrl = gma_read16(hw, port, GM_GP_CTRL);
ctrl &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
gma_write16(hw, port, GM_GP_CTRL, ctrl);
@@ -2167,7 +2165,6 @@ static void yukon_link_down(struct skge_port *skge)
gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, ctrl);
}
- yukon_reset(hw, port);
skge_link_down(skge);
yukon_init(hw, port);
@@ -2268,6 +2265,8 @@ static void skge_phy_reset(struct skge_port *skge)
yukon_init(hw, port);
}
mutex_unlock(&hw->phy_mutex);
+
+ dev->set_multicast_list(dev);
}
/* Basic MII support */