diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-22 07:12:09 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-22 07:12:09 +0000 |
| commit | 6983aacd37e799b035732187aab6896f46f57a60 (patch) | |
| tree | 0c7e52610b4ffe5971af3fcc7e40d0bb8197cd73 /target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch | |
| parent | c5d266aa2a7762741af4353b6e8852e4a9fb9dae (diff) | |
kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21081 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch b/target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch index 5edcfe8ef..c887a4ed9 100644 --- a/target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch +++ b/target/linux/brcm63xx/patches-2.6.33/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 +@@ -962,7 +962,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)); |