pppoe: include netinet/in.h before linux/in.h

[ppp.git] / pppd / plugins / rp-pppoe / pppoe.h

diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
index 9ab2eee3914c3718daa055375f32095beaa8a8f5..c4aaa6e68856e8506643a6c30c86177070af1fd7 100644 (file)
--- a/pppd/plugins/rp-pppoe/pppoe.h
+++ b/pppd/plugins/rp-pppoe/pppoe.h
@@ -47,6 +47,10 @@
 #include <sys/socket.h>
 #endif
 
 #include <sys/socket.h>
 #endif
 

+/* This has to be included before Linux 4.8's linux/in.h
+ * gets dragged in. */
+#include <netinet/in.h>
+

 /* Ugly header files on some Linux boxes... */
 #if defined(HAVE_LINUX_IF_H)
 #include <linux/if.h>
 /* Ugly header files on some Linux boxes... */
 #if defined(HAVE_LINUX_IF_H)
 #include <linux/if.h>


@@ -84,8 +88,6 @@ typedef unsigned long UINT32_t;
 #include <linux/if_ether.h>
 #endif
 
 #include <linux/if_ether.h>
 #endif
 

-#include <netinet/in.h>
-

 #ifdef HAVE_NETINET_IF_ETHER_H
 #include <sys/types.h>
 
 #ifdef HAVE_NETINET_IF_ETHER_H
 #include <sys/types.h>
 


@@ -98,7 +100,6 @@ typedef unsigned long UINT32_t;
 #endif
 
 
 #endif
 
 

-

 /* Ethernet frame types according to RFC 2516 */
 #define ETH_PPPOE_DISCOVERY 0x8863
 #define ETH_PPPOE_SESSION   0x8864
 /* Ethernet frame types according to RFC 2516 */
 #define ETH_PPPOE_DISCOVERY 0x8863
 #define ETH_PPPOE_SESSION   0x8864