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
commite9a02ff509c78b74ac820dc407a7b972fd73018d (patch)
treeacc5789563dd20e6b9ca847e9a6fe883aa1e64a3
parent43f444a58c321f6f1f62ea1b191783edd4b8c080 (diff)
downloadupstream-e9a02ff509c78b74ac820dc407a7b972fd73018d.tar.gz
upstream-e9a02ff509c78b74ac820dc407a7b972fd73018d.tar.bz2
upstream-e9a02ff509c78b74ac820dc407a7b972fd73018d.zip
merge upstream fixes on mdio loop
SVN-Revision: 18335
-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;