Attachment 273961 Details for Bug 406051 – rhel5-test0.patch

[patch] rhel5-test0.patch

406051.patch (text/plain), 1.01 KB, created by Andy Gospodarek on 2007-11-30 16:15:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2007-11-30 16:15:26 UTC

Size: 1.01 KB

patch

obsolete

>diff --git a/drivers/net/skge.c b/drivers/net/skge.c
>index ad878df..e070002 100644
>--- a/drivers/net/skge.c
>+++ b/drivers/net/skge.c
>@@ -1928,8 +1928,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);
>@@ -1943,7 +1941,6 @@ static void yukon_link_down(struct skge_port *skge)
> 
> 	}
> 
>-	yukon_reset(hw, port);
> 	skge_link_down(skge);
> 
> 	yukon_init(hw, port);
>@@ -2031,6 +2028,7 @@ static void skge_phy_reset(struct skge_port *skge)
> {
> 	struct skge_hw *hw = skge->hw;
> 	int port = skge->port;
>+	struct net_device *dev = hw->dev[port];
> 
> 	netif_stop_queue(skge->netdev);
> 	netif_carrier_off(skge->netdev);
>@@ -2044,6 +2042,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 */

Actions: View | Diff

Attachments on bug 406051: 273961