aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-07 12:48:17 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-07 12:48:17 +0000
commitfee653c74989cd584ac042b053cec070c2821664 (patch)
tree11dac156d3d233cf1641205eec48a92d3897ed6a
parent13938775756000aaab8526dbc960590ff97f7b2d (diff)
downloadmaster-187ad058-fee653c74989cd584ac042b053cec070c2821664.tar.gz
master-187ad058-fee653c74989cd584ac042b053cec070c2821664.tar.bz2
master-187ad058-fee653c74989cd584ac042b053cec070c2821664.zip
[brcm63xx] merge upstream fixes on mdio loop
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18335 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch b/target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch
index 0271aa6c91..e4c8026b36 100644
--- a/target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch
+++ b/target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch
@@ -8,6 +8,15 @@
#include <bcm63xx_dev_enet.h>
#include "bcm63xx_enet.h"
+@@ -91,7 +90,7 @@
+ if (enet_readl(priv, ENET_IR_REG) & ENET_IR_MII)
+ break;
+ udelay(1);
+- } while (limit-- >= 0);
++ } while (limit-- > 0);
+
+ return (limit < 0) ? 1 : 0;
+ }
@@ -321,7 +320,7 @@
if (len < copybreak) {
struct sk_buff *nskb;