Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

[karo-tx-uboot.git] / net / eth.c

diff --git a/net/eth.c b/net/eth.c
index bcd7d42a3a70e1216d0b635ab36c8adb93db4c23..4a9e1e691b50b5c50238f2d750f9a3141998d4da 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -218,6 +218,9 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_UEC_ETH3)
        uec_initialize(2);
 #endif
+#if defined(CONFIG_UEC_ETH4)
+       uec_initialize(3);
+#endif
 
 #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
        fec_initialize(bis);
@@ -526,6 +529,15 @@ int eth_receive(volatile void *packet, int length)
 void eth_try_another(int first_restart)
 {
        static struct eth_device *first_failed = NULL;
+       char *ethrotate;
+
+       /*
+        * Do not rotate between network interfaces when
+        * 'ethrotate' variable is set to 'no'.
+        */
+       if (((ethrotate = getenv ("ethrotate")) != NULL) &&
+           (strcmp(ethrotate, "no") == 0))
+               return;
 
        if (!eth_current)
                return;