linux/types.h: fix typo unchar

[oweals/u-boot.git] / include / env_flags.h

diff --git a/include/env_flags.h b/include/env_flags.h
index 9e87e1b7dbf3e13310ed0dee8c3395628669d782..725841a891d7577dc9cd42414552fef69525a460 100644 (file)
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2012
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ENV_FLAGS_H__
@@ -37,9 +36,9 @@ enum env_flags_varaccess {
 #define CONFIG_ENV_FLAGS_LIST_STATIC ""
 #endif
 
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
 #ifdef CONFIG_REGEX
-#define ETHADDR_WILDCARD "\\d?"
+#define ETHADDR_WILDCARD "\\d*"
 #else
 #define ETHADDR_WILDCARD
 #endif
@@ -57,8 +56,8 @@ enum env_flags_varaccess {
        "gatewayip:i," \
        "netmask:i," \
        "serverip:i," \
-       "nvlan:i," \
-       "vlan:i," \
+       "nvlan:d," \
+       "vlan:d," \
        "dnsip:i,"
 #else
 #define ETHADDR_FLAGS
@@ -147,19 +146,20 @@ int env_flags_validate_env_set_params(char *name, char *const val[], int count);
 
 #else /* !USE_HOSTCC */
 
+#include <env.h>
 #include <search.h>
 
 /*
  * When adding a variable to the environment, initialize the flags for that
  * variable.
  */
-void env_flags_init(ENTRY *var_entry);
+void env_flags_init(struct env_entry *var_entry);
 
 /*
  * Validate the newval for to conform with the requirements defined by its flags
  */
-int env_flags_validate(const ENTRY *item, const char *newval, enum env_op op,
-       int flag);
+int env_flags_validate(const struct env_entry *item, const char *newval,
+                      enum env_op op, int flag);
 
 #endif /* USE_HOSTCC */