fc7248fa85
The patches have been updated for 3.18.6 and should fix build issues with code that includes netinet/in6.h and linux headers (among others).
24 lines
689 B
Diff
24 lines
689 B
Diff
--- include/uapi/linux/if_ether.h.orig 2015-05-31 15:46:25.659328508 +0200
|
|
+++ include/uapi/linux/if_ether.h 2015-05-31 15:47:19.843238460 +0200
|
|
@@ -22,6 +22,7 @@
|
|
#define _UAPI_LINUX_IF_ETHER_H
|
|
|
|
#include <linux/types.h>
|
|
+#include <linux/libc-compat.h>
|
|
|
|
/*
|
|
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
|
|
@@ -134,11 +135,12 @@
|
|
* This is an Ethernet frame header.
|
|
*/
|
|
|
|
+#if __UAPI_DEF_ETHHDR
|
|
struct ethhdr {
|
|
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
|
|
unsigned char h_source[ETH_ALEN]; /* source ether addr */
|
|
__be16 h_proto; /* packet type ID field */
|
|
} __attribute__((packed));
|
|
-
|
|
+#endif
|
|
|
|
#endif /* _UAPI_LINUX_IF_ETHER_H */
|