From dc11a30bbdeaca3be3d46ac5778ddee53d04e8fb Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 22 Apr 2010 15:27:46 +0000 Subject: [brcm63xx] refresh 2.6.32 patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21086 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.32/230-external_phy_fix.patch | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch') diff --git a/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch b/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch index 5edcfe8ef..96160885d 100644 --- a/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch +++ b/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch @@ -1,13 +1,13 @@ ---- linux-2.6.32.10.orig/drivers/net/bcm63xx_enet.c 2010-04-06 19:25:52.612158288 +0100 -+++ linux-2.6.32.10/drivers/net/bcm63xx_enet.c 2010-04-07 21:40:26.991801424 +0100 -@@ -965,7 +965,9 @@ - /* all set, enable mac and interrupts, start dma engine and - * kick rx dma channel */ - wmb(); -- enet_writel(priv, ENET_CTL_ENABLE_MASK, ENET_CTL_REG); -+ val = enet_readl(priv, ENET_CTL_REG); -+ val |= ENET_CTL_ENABLE_MASK; -+ enet_writel(priv, val, ENET_CTL_REG); - enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG); - enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK, - ENETDMA_CHANCFG_REG(priv->rx_chan)); \ No newline at end of file +--- a/drivers/net/bcm63xx_enet.c ++++ b/drivers/net/bcm63xx_enet.c +@@ -965,7 +965,9 @@ static int bcm_enet_open(struct net_devi + /* all set, enable mac and interrupts, start dma engine and + * kick rx dma channel */ + wmb(); +- enet_writel(priv, ENET_CTL_ENABLE_MASK, ENET_CTL_REG); ++ val = enet_readl(priv, ENET_CTL_REG); ++ val |= ENET_CTL_ENABLE_MASK; ++ enet_writel(priv, val, ENET_CTL_REG); + enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG); + enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK, + ENETDMA_CHANCFG_REG(priv->rx_chan)); -- cgit v1.2.3