From d54d93ac7f0fa6e1cf92880507f9eac7352718dd Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Wed, 27 Aug 2008 17:10:37 +0000 Subject: [PATCH] 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 --- sys/net/ethernet.h | 5 ----- 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 685f3d6c27a..1cb57addf33 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 25004b4ebcb..d20fb65cfd8 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 +#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);