From 2997f0fc109dd026404c9374dd69f89d398f9f95 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 9 Apr 2010 01:04:52 +0000 Subject: [PATCH] --- yaml --- r: 194046 b: refs/heads/master c: 5e10d4a7fc80e4ef310c07a6a547406fef50534a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bcm63xx_enet.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a3163ad1901..b32c3dd2dc4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0de8655ab9181cbaca82aa60402b14118e06d030 +refs/heads/master: 5e10d4a7fc80e4ef310c07a6a547406fef50534a diff --git a/trunk/drivers/net/bcm63xx_enet.c b/trunk/drivers/net/bcm63xx_enet.c index d91105693c8a..37a4be57a2b7 100644 --- a/trunk/drivers/net/bcm63xx_enet.c +++ b/trunk/drivers/net/bcm63xx_enet.c @@ -959,7 +959,9 @@ static int bcm_enet_open(struct net_device *dev) /* 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));