From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 5 Mar 2015 00:11:31 +0000 (-0800)
Subject: Define ETH_ALEN in generic <netinet/if_ether.h>.
X-Git-Tag: glibc-2.22~515
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bff5aab5bce71b4d8b92cb9dc575054ae68b9db;p=thirdparty%2Fglibc.git

Define ETH_ALEN in generic <netinet/if_ether.h>.
---

diff --git a/ChangeLog b/ChangeLog
index 9147b384924..d4cfc27bfc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-04  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/generic/netinet/if_ether.h: Don't #include <features.h>.
+	(ETH_ALEN): New macro.
+	(struct ether_addr): Use it for length of ether_addr_octet.
+
 	* nss/test-netdb.c: Don't #include <rpc/netdb.h>.
 	(setdb): Don't call __nss_configure_lookup for "rpc".
 	(do_test): Don't call test_rpc.
diff --git a/sysdeps/generic/netinet/if_ether.h b/sysdeps/generic/netinet/if_ether.h
index 24ffd8b5bae..54dbf47ef8a 100644
--- a/sysdeps/generic/netinet/if_ether.h
+++ b/sysdeps/generic/netinet/if_ether.h
@@ -16,17 +16,17 @@
    <http://www.gnu.org/licenses/>.  */
 
 #ifndef __NETINET_IF_ETHER_H
-
 #define __NETINET_IF_ETHER_H	1
-#include <features.h>
 
 #include <sys/types.h>
 
+#define ETH_ALEN	6	/* Octets in one ethernet address.  */
+
 /* This is a name for the 48 bit ethernet address available on many
    systems.  */
 struct ether_addr
 {
-  u_int8_t ether_addr_octet[6];
+  u_int8_t ether_addr_octet[ETH_ALEN];
 } __attribute__ ((__packed__));
 
 #endif /* netinet/if_ether.h */