Dear Stefan Althoefer,
In message <[EMAIL PROTECTED]> you wrote:
> From fdeee62f0902b25be1a2a6bf52fb714b0f4f9e59 Mon Sep 17 00:00:00 2001
> From: Stefan Althoefer <[EMAIL PROTECTED]>
> Date: Sun, 7 Dec 2008 14:17:08 +0100
> Subject: [PATCH] common: nvedit to protect additional ethernet addresses
>
> This adds "eth[0-9]+addr" to the protected
> environment variables that can only be written once.
>
> Code for detecting protected variables was restructured.
>
> Signed-off-by: Stefan Althoefer <[EMAIL PROTECTED]>
...
> @@ -181,18 +186,31 @@ int _do_setenv (int flag, int argc, char *argv[])
> * Ethernet Address and serial# can be set only once,
> * ver is readonly.
> */
> - if (
> + protected = 0;
> #ifdef CONFIG_HAS_UID
> /* Allow serial# forced overwrite with 0xdeaf4add flag */
> - ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
> + if ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add))
> #else
> - (strcmp (name, "serial#") == 0) ||
> + if (strcmp (name, "serial#") == 0)
> #endif
> - ((strcmp (name, "ethaddr") == 0)
> + protected = 1;
Here we already know that the variable is "serial#", so it cannot be
any of the "eth*addr" variables.
> + if (strcmp (name, "ethaddr") == 0)
> #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
> - && (strcmp ((char
> *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
> + /* Allow "ethaddr" overwrite to change pre-configured
> address */
> + if (strcmp ((char
> *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
> #endif /* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
> - ) ) {
> + protected = 1;
> +
> + /* "eth[0-9]+addr" is always protected */
> + if (strncmp (name, "eth", 3) == 0) {
> + ethnum = simple_strtoul (name+3, &s, 10);
> + if (s != name + 3)
> + if (strcmp (s, "addr") == 0)
> + protected = 1;
> + }
Then why do we continue to test for these impossible cases? It's just
wasting CPU cycles.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
How many seconds are there in a year? If I tell you there are 3.155 x
10^7, you won't even try to remember it. On the other hand, who could
forget that, to within half a percent, pi seconds is a nanocentury.
- Tom Duff, Bell Labs
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
