D50947.id158559.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50947.id158559.diff
View Options

	diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
	--- a/sys/net/ethernet.h
	+++ b/sys/net/ethernet.h
	@@ -62,6 +62,8 @@
	u_char ether_shost[ETHER_ADDR_LEN];
	u_short ether_type;
	} __packed;
	+_Static_assert(sizeof(struct ether_header) == ETHER_HDR_LEN,
	+ "size of struct ether_header is wrong");

	/*
	* Structure of a 48-bit Ethernet address.
	@@ -69,6 +71,8 @@
	struct ether_addr {
	u_char octet[ETHER_ADDR_LEN];
	} __packed;
	+_Static_assert(sizeof(struct ether_addr) == ETHER_ADDR_LEN,
	+ "size of struct ether_addr is wrong");

	#define ETHER_IS_MULTICAST(addr) ((addr) & 0x01) / is address mcast/bcast? */
	#define ETHER_IS_IPV6_MULTICAST(addr) \
	@@ -112,6 +116,8 @@
	uint16_t evl_tag;
	uint16_t evl_proto;
	} __packed;
	+_Static_assert(sizeof(struct ether_vlan_header) == ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN,
	+ "size of struct ether_vlan_header is wrong");

	#define EVL_VLID_MASK 0x0FFF
	#define EVL_PRI_MASK 0xE000
	diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
	--- a/sys/net/if_ethersubr.c
	+++ b/sys/net/if_ethersubr.c
	@@ -92,11 +92,6 @@

	#include <crypto/sha1.h>

	-#ifdef CTASSERT
	-CTASSERT(sizeof (struct ether_header) == ETHER_ADDR_LEN * 2 + 2);
	-CTASSERT(sizeof (struct ether_addr) == ETHER_ADDR_LEN);
	-#endif
	-
	VNET_DEFINE(pfil_head_t, link_pfil_head); /* Packet filter hooks */

	/* netgraph node hooks for ng_ether(4) */