From 432b1b63bb0b95332b931b1aed029a6996ceb81f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 1 Dec 2006 11:41:08 -0800 Subject: [PATCH] --- yaml --- r: 41547 b: refs/heads/master c: 758140900a82e3ed3bb2be1d4705dd352fe44825 h: refs/heads/master i: 41545: d04a9d61c8bd6d43b90702bb8100f43b8bf227d8 41543: 7c6f8ba080df0d9d0874621afa5a907de2076a3b v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7d011569d2a3..74438046e9f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f789dfdc44d5bbc04fb7f06e1e4eb682169acaaf +refs/heads/master: 758140900a82e3ed3bb2be1d4705dd352fe44825 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index b2949035f66a..010fc6541122 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/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 */