1*4882a593SmuzhiyunFrom 3984adc4976de7553f51e0cf4de1e18c373b332b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Baruch Siach <baruch@tkos.co.il> 3*4882a593SmuzhiyunDate: Thu, 15 Dec 2016 15:10:19 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Avoid redefinition of struct ethhdr 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis is a workaround to the if_ether.h conflict between musl and the kernel. 7*4882a593SmuzhiyunBoth define struct ethhdr. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun include/netinet/if_ether.h | 3 +++ 12*4882a593Smuzhiyun 1 file changed, 3 insertions(+) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h 15*4882a593Smuzhiyunindex 11ee65823f93..cfe1949d3371 100644 16*4882a593Smuzhiyun--- a/include/netinet/if_ether.h 17*4882a593Smuzhiyun+++ b/include/netinet/if_ether.h 18*4882a593Smuzhiyun@@ -1,6 +1,9 @@ 19*4882a593Smuzhiyun #ifndef _NETINET_IF_ETHER_H 20*4882a593Smuzhiyun #define _NETINET_IF_ETHER_H 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun+/* Suppress kernel if_ether.h header inclusion */ 23*4882a593Smuzhiyun+#define _LINUX_IF_ETHER_H 24*4882a593Smuzhiyun+ 25*4882a593Smuzhiyun #include <stdint.h> 26*4882a593Smuzhiyun #include <sys/types.h> 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun-- 29*4882a593Smuzhiyun2.10.2 30*4882a593Smuzhiyun 31