net: Kirkwood_egiga.c bugfixes for rx path

[oweals/u-boot.git] / net / eth.c

diff --git a/net/eth.c b/net/eth.c
index 9b503124fb637dea1accad08f890c4b5d1a25c11..aff698724d993f6af03b6ec939ef002a98926018 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2001-2004
+ * (C) Copyright 2001-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -26,7 +26,6 @@
 #include <net.h>
 #include <miiphy.h>
 
-#ifdef CONFIG_CMD_NET
 void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
 {
        char *end;
@@ -60,9 +59,8 @@ int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr)
        sprintf(enetvar, index ? "eth%daddr" : "ethaddr", index);
        return eth_getenv_enetaddr(enetvar, enetaddr);
 }
-#endif
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
+#ifdef CONFIG_NET_MULTI
 
 /*
  * CPU and board-specific Ethernet initializations.  Aliased function
@@ -175,7 +173,8 @@ int eth_register(struct eth_device* dev)
                }
 #endif
        } else {
-               for (d=eth_devices; d->next!=eth_devices; d=d->next);
+               for (d=eth_devices; d->next!=eth_devices; d=d->next)
+                       ;
                d->next = dev;
        }
 
@@ -492,7 +491,8 @@ char *eth_get_name (void)
 {
        return (eth_current ? eth_current->name : "unknown");
 }
-#elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI)
+
+#else /* !CONFIG_NET_MULTI */
 
 #warning Ethernet driver is deprecated.  Please update to use CONFIG_NET_MULTI