From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 29 Mar 2017 07:58:17 +0000 (+0300)
Subject: [linux] Fix building with kernel 4.11 headers
X-Git-Tag: v1.20.1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c056f02d09a19fb3ac91859c7bd8c558c8473cf;p=thirdparty%2Fipxe.git

[linux] Fix building with kernel 4.11 headers

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/drivers/linux/af_packet.c b/src/drivers/linux/af_packet.c
index 1622c8c0e..65aafc5b1 100644
--- a/src/drivers/linux/af_packet.c
+++ b/src/drivers/linux/af_packet.c
@@ -31,6 +31,7 @@
 #include <ipxe/socket.h>
 
 /* This hack prevents pre-2.6.32 headers from redefining struct sockaddr */
+#define _SYS_SOCKET_H
 #define __GLIBC__ 2
 #include <linux/socket.h>
 #include <linux/if.h>
diff --git a/src/drivers/linux/tap.c b/src/drivers/linux/tap.c
index 979436654..6fe76fd4d 100644
--- a/src/drivers/linux/tap.c
+++ b/src/drivers/linux/tap.c
@@ -31,6 +31,7 @@
 #include <ipxe/socket.h>
 
 /* This hack prevents pre-2.6.32 headers from redefining struct sockaddr */
+#define _SYS_SOCKET_H
 #define __GLIBC__ 2
 #include <linux/socket.h>
 #undef __GLIBC__