diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-02-11 18:52:38 -0500 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-20 22:39:10 +0100 | 
| commit | 56b555a644f3cbb1b3929cb52b61d3ce483885f5 (patch) | |
| tree | b32060613b8bfaca159cd638a31ddc055db3687c | |
| parent | 5013533467c1de731c2f0c9beb4b41ce3f07cbeb (diff) | |
| download | olio-uboot-2014.01-56b555a644f3cbb1b3929cb52b61d3ce483885f5.tar.xz olio-uboot-2014.01-56b555a644f3cbb1b3929cb52b61d3ce483885f5.zip | |
nvedit: do not update global bi_enetaddr and do not call eth_set_enetaddr()
Since the ethernet layer handles updating of device addresses itself from
the environment, there is no point in calling eth_set_enetaddr().
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
| -rw-r--r-- | common/cmd_nvedit.c | 24 | 
1 files changed, 1 insertions, 23 deletions
| diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 68c673e7c..95eebb576 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -283,18 +283,6 @@ int _do_setenv (int flag, int argc, char *argv[])  		*++env = '\0';  	} -#ifdef CONFIG_NET_MULTI -	if (strncmp(name, "eth", 3) == 0) { -		char *end; -		int   num = simple_strtoul(name+3, &end, 10); - -		if (strcmp(end, "addr") == 0) { -			eth_set_enetaddr(num, argv[2]); -		} -	} -#endif - -  	/* Delete only ? */  	if ((argc < 3) || argv[2] == NULL) {  		env_crc_update (); @@ -342,18 +330,8 @@ int _do_setenv (int flag, int argc, char *argv[])  	 * entry in the enviornment is changed  	 */ -	if (strcmp(argv[1],"ethaddr") == 0) { -		char *s = argv[2];	/* always use only one arg */ -		char *e; -		for (i=0; i<6; ++i) { -			bd->bi_enetaddr[i] = s ? simple_strtoul(s, &e, 16) : 0; -			if (s) s = (*e) ? e+1 : e; -		} -#ifdef CONFIG_NET_MULTI -		eth_set_enetaddr(0, argv[2]); -#endif +	if (strcmp(argv[1],"ethaddr") == 0)  		return 0; -	}  	if (strcmp(argv[1],"ipaddr") == 0) {  		char *s = argv[2];	/* always use only one arg */ |