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

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

diff --git a/net/eth_common.c b/net/eth_common.c
index 66d0d22966e01463d453a8e22a2898a65e67c8a1..ed26b1b69359aae191481f058db7e99fa8c329b5 100644 (file)
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -1,47 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001-2015
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Joe Hershberger, National Instruments
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
+#include <env.h>
 #include <miiphy.h>
 #include <net.h>
 #include "eth_internal.h"
 
-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_env_get_enetaddr(const char *name, uchar *enetaddr)
-{
-       eth_parse_enetaddr(env_get(name), enetaddr);
-       return is_valid_ethaddr(enetaddr);
-}
-
-int eth_env_set_enetaddr(const char *name, const uchar *enetaddr)
-{
-       char buf[ARP_HLEN_ASCII + 1];
-
-       if (eth_env_get_enetaddr(name, (uchar *)buf))
-               return -EEXIST;
-
-       sprintf(buf, "%pM", enetaddr);
-
-       return env_set(name, buf);
-}
-
 int eth_env_get_enetaddr_by_index(const char *base_name, int index,
                                 uchar *enetaddr)
 {
@@ -140,7 +110,7 @@ void eth_set_current(void)
        static int  env_changed_id;
        int     env_id;
 
-       env_id = get_env_id();
+       env_id = env_get_id();
        if ((act == NULL) || (env_changed_id != env_id)) {
                act = env_get("ethact");
                env_changed_id = env_id;