diff options
author | emaste <emaste@FreeBSD.org> | 2008-08-27 17:10:37 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2008-08-27 17:10:37 +0000 |
commit | 9fc003a7629974c6e6aa667c52c5aabb96b0962d (patch) | |
tree | dfb3be4d55a3146207e18e8e237fb3ddc270ae9c | |
parent | fff9c7a248c5a7b446ddbf66aac2ae4d61bc7994 (diff) | |
download | FreeBSD-src-9fc003a7629974c6e6aa667c52c5aabb96b0962d.zip FreeBSD-src-9fc003a7629974c6e6aa667c52c5aabb96b0962d.tar.gz |
Move CTASSERT of ether header sizes out of the header file and into
if_ethersubr.c. CTASSERT is implemented using a dummy typedef, which if
used in a header file may conflict with another CTASSERT in a source file
using that header.
I'll make a note of this in CTASSERT's man page.
Approved by: imp
-rw-r--r-- | sys/net/ethernet.h | 5 | ||||
-rw-r--r-- | sys/net/if_ethersubr.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 685f3d6..1cb57ad 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -70,11 +70,6 @@ struct ether_addr { u_char octet[ETHER_ADDR_LEN]; } __packed; -#ifdef CTASSERT -CTASSERT(sizeof (struct ether_header) == ETHER_ADDR_LEN * 2 + 2); -CTASSERT(sizeof (struct ether_addr) == ETHER_ADDR_LEN); -#endif - #define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */ /* diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 25004b4..d20fb65 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -101,6 +101,11 @@ extern u_char aarp_org_code[3]; #include <security/mac/mac_framework.h> +#ifdef CTASSERT +CTASSERT(sizeof (struct ether_header) == ETHER_ADDR_LEN * 2 + 2); +CTASSERT(sizeof (struct ether_addr) == ETHER_ADDR_LEN); +#endif + /* netgraph node hooks for ng_ether(4) */ void (*ng_ether_input_p)(struct ifnet *ifp, struct mbuf **mp); void (*ng_ether_input_orphan_p)(struct ifnet *ifp, struct mbuf *m); |