[U-Boot] [PATCH] Move is_valid_ether_addr() to include/net.h

[U-Boot] [PATCH] Move is_valid_ether_addr() to include/net.h

[Mike Frysinger]

Import the is_valid_ether_addr() function from the Linux kernel.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
---
 board/bf537-stamp/bf537-stamp.c |   16 ----------------
 include/net.h                   |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c
index 7303f1b..cec2b26 100644
--- a/board/bf537-stamp/bf537-stamp.c
+++ b/board/bf537-stamp/bf537-stamp.c
@@ -34,22 +34,6 @@
 #include <asm/mach-common/bits/bootrom.h>
 #include <netdev.h>
 
-/**
- * is_valid_ether_addr - Determine if the given Ethernet address is valid
- * @addr: Pointer to a six-byte array containing the Ethernet address
- *
- * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
- * a multicast address, and is not FF:FF:FF:FF:FF:FF.
- *
- * Return true if the address is valid.
- */
-static inline int is_valid_ether_addr(const u8 * addr)
-{
-	/* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
-	 * explicitly check for it here. */
-	return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
-}
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #define POST_WORD_ADDR 0xFF903FFC
diff --git a/include/net.h b/include/net.h
index d2d394f..bbe0d4b 100644
--- a/include/net.h
+++ b/include/net.h
@@ -474,6 +474,22 @@ static inline int is_multicast_ether_addr(const u8 *addr)
 	return (0x01 & addr[0]);
 }
 
+/**
+ * is_valid_ether_addr - Determine if the given Ethernet address is valid
+ * @addr: Pointer to a six-byte array containing the Ethernet address
+ *
+ * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
+ * a multicast address, and is not FF:FF:FF:FF:FF:FF.
+ *
+ * Return true if the address is valid.
+ */
+static inline int is_valid_ether_addr(const u8 * addr)
+{
+	/* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
+	 * explicitly check for it here. */
+	return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
+}
+
 /* Convert an IP address to a string */
 extern void	ip_to_string (IPaddr_t x, char *s);
 
-- 
1.6.1.1

[U-Boot] [PATCH] Move is_valid_ether_addr() to include/net.h

[Ben Warren]

Mike Frysinger wrote:
> Import the is_valid_ether_addr() function from the Linux kernel.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> CC: Ben Warren <biggerbadderben@gmail.com>
> ---
>  board/bf537-stamp/bf537-stamp.c |   16 ----------------
>  include/net.h                   |   16 ++++++++++++++++
>  2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c
> index 7303f1b..cec2b26 100644
> --- a/board/bf537-stamp/bf537-stamp.c
> +++ b/board/bf537-stamp/bf537-stamp.c
> @@ -34,22 +34,6 @@
>  #include <asm/mach-common/bits/bootrom.h>
>  #include <netdev.h>
>  
> -/**
> - * is_valid_ether_addr - Determine if the given Ethernet address is valid
> - * @addr: Pointer to a six-byte array containing the Ethernet address
> - *
> - * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
> - * a multicast address, and is not FF:FF:FF:FF:FF:FF.
> - *
> - * Return true if the address is valid.
> - */
> -static inline int is_valid_ether_addr(const u8 * addr)
> -{
> -	/* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
> -	 * explicitly check for it here. */
> -	return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
> -}
> -
>  DECLARE_GLOBAL_DATA_PTR;
>  
>  #define POST_WORD_ADDR 0xFF903FFC
> diff --git a/include/net.h b/include/net.h
> index d2d394f..bbe0d4b 100644
> --- a/include/net.h
> +++ b/include/net.h
> @@ -474,6 +474,22 @@ static inline int is_multicast_ether_addr(const u8 *addr)
>  	return (0x01 & addr[0]);
>  }
>  
> +/**
> + * is_valid_ether_addr - Determine if the given Ethernet address is valid
> + * @addr: Pointer to a six-byte array containing the Ethernet address
> + *
> + * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
> + * a multicast address, and is not FF:FF:FF:FF:FF:FF.
> + *
> + * Return true if the address is valid.
> + */
> +static inline int is_valid_ether_addr(const u8 * addr)
> +{
> +	/* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to
> +	 * explicitly check for it here. */
> +	return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr);
> +}
> +
>  /* Convert an IP address to a string */
>  extern void	ip_to_string (IPaddr_t x, char *s);
>  
>   
Applied to net repo.

thanks,
Ben