This delta is primarily a fix for es2lan devices that

will sometimes fail to initialize problem due to a lock
contention with management hardware. However, in order to
deliver that fix it was necessary to take a shared code
update as a whole, and this required scattered changes in
the core code to be compatible.

The em driver now has VLAN HW support added as the igb
driver had previously.

MFC after:  ASAP - in time for 7.1 RELEASE

1 files changed, 4 insertions, 0 deletions

diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h
index 8a63950..b478f29 100644
--- a/sys/dev/e1000/e1000_osdep.h
+++ b/sys/dev/e1000/e1000_osdep.h
@@ -93,6 +93,10 @@ typedef int16_t		s16;
 typedef int8_t		s8;
 typedef boolean_t	bool;
 
+#define __le16		u16
+#define __le32		u32
+#define __le64		u64
+
 struct e1000_osdep
 {
 	bus_space_tag_t    mem_bus_space_tag;