merge upstream fixes on mdio loop
authorFlorian Fainelli <florian@openwrt.org>
Sat, 7 Nov 2009 12:48:17 +0000 (12:48 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sat, 7 Nov 2009 12:48:17 +0000 (12:48 +0000)
SVN-Revision: 18335

target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch

index 0271aa6c915d2ba80c4b0399ab63fb54f57cb47a..e4c8026b368d45418f0e4eeb5eaea5a62ad43bcf 100644 (file)
@@ -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;