netstar: fix crc32.c dependancy location

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

diff --git a/net/eth.c b/net/eth.c
index ec2ef1a365fc7547598613dd7a4d11c06da5b312..4bbf84b6bb028c2d01ce644b83dd020bc2b1e4be 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -26,8 +26,40 @@
 #include <net.h>
 #include <miiphy.h>
 
+#ifdef CONFIG_CMD_NET
+void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
+{
+       char *end;
+       int i;
+
+       for (i = 0; i < 6; ++i) {
+               enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
+               if (addr)
+                       addr = (*end) ? end + 1 : end;
+       }
+}
+
+int eth_getenv_enetaddr(char *name, uchar *enetaddr)
+{
+       eth_parse_enetaddr(getenv(name), enetaddr);
+       return is_valid_ether_addr(enetaddr);
+}
+
+int eth_setenv_enetaddr(char *name, const uchar *enetaddr)
+{
+       char buf[20];
+
+       sprintf(buf, "%pM", enetaddr);
+
+       return setenv(name, buf);
+}
+#endif
+
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
 
+static char *act = NULL;
+static int  env_changed_id = 0;
+
 /*
  * CPU and board-specific Ethernet initializations.  Aliased function
  * signals caller to move on
@@ -153,8 +185,7 @@ int eth_initialize(bd_t *bis)
 {
        char enetvar[32];
        unsigned char env_enetaddr[6];
-       int i, eth_number = 0;
-       char *tmp, *end;
+       int eth_number = 0;
 
        eth_devices = NULL;
        eth_current = NULL;
@@ -194,13 +225,7 @@ int eth_initialize(bd_t *bis)
                        }
 
                        sprintf(enetvar, eth_number ? "eth%daddr" : "ethaddr", eth_number);
-                       tmp = getenv (enetvar);
-
-                       for (i=0; i<6; i++) {
-                               env_enetaddr[i] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
-                               if (tmp)
-                                       tmp = (*end) ? end+1 : end;
-                       }
+                       eth_getenv_enetaddr(enetvar, env_enetaddr);
 
                        if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
                                if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
@@ -208,16 +233,10 @@ int eth_initialize(bd_t *bis)
                                {
                                        printf ("\nWarning: %s MAC addresses don't match:\n",
                                                dev->name);
-                                       printf ("Address in SROM is         "
-                                              "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                                              dev->enetaddr[0], dev->enetaddr[1],
-                                              dev->enetaddr[2], dev->enetaddr[3],
-                                              dev->enetaddr[4], dev->enetaddr[5]);
-                                       printf ("Address in environment is  "
-                                              "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                                              env_enetaddr[0], env_enetaddr[1],
-                                              env_enetaddr[2], env_enetaddr[3],
-                                              env_enetaddr[4], env_enetaddr[5]);
+                                       printf ("Address in SROM is         %pM\n",
+                                               dev->enetaddr);
+                                       printf ("Address in environment is  %pM\n",
+                                               env_enetaddr);
                                }
 
                                memcpy(dev->enetaddr, env_enetaddr, 6);
@@ -246,19 +265,13 @@ int eth_initialize(bd_t *bis)
 void eth_set_enetaddr(int num, char *addr) {
        struct eth_device *dev;
        unsigned char enetaddr[6];
-       char *end;
-       int i;
 
        debug ("eth_set_enetaddr(num=%d, addr=%s)\n", num, addr);
 
        if (!eth_devices)
                return;
 
-       for (i=0; i<6; i++) {
-               enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
-               if (addr)
-                       addr = (*end) ? end+1 : end;
-       }
+       eth_parse_enetaddr(addr, enetaddr);
 
        dev = eth_devices;
        while(num-- > 0) {
@@ -269,11 +282,8 @@ void eth_set_enetaddr(int num, char *addr) {
        }
 
        debug ( "Setting new HW address on %s\n"
-               "New Address is             %02X:%02X:%02X:%02X:%02X:%02X\n",
-               dev->name,
-               enetaddr[0], enetaddr[1],
-               enetaddr[2], enetaddr[3],
-               enetaddr[4], enetaddr[5]);
+               "New Address is             %pM\n",
+               dev->name, enetaddr);
 
        memcpy(dev->enetaddr, enetaddr, 6);
 }
@@ -461,13 +471,17 @@ void eth_try_another(int first_restart)
 #ifdef CONFIG_NET_MULTI
 void eth_set_current(void)
 {
-       char *act;
        struct eth_device* old_current;
+       int     env_id;
 
        if (!eth_current)       /* XXX no current */
                return;
 
-       act = getenv("ethact");
+       env_id = get_env_id();
+       if ((act == NULL) || (env_changed_id != env_id)) {
+               act = getenv("ethact");
+               env_changed_id = env_id;
+       }
        if (act != NULL) {
                old_current = eth_current;
                do {