Message ID | 1424127948-22484-44-git-send-email-mikko.rapeli@iki.fi |
---|---|
State | Awaiting Upstream |
Delegated to: | Pablo Neira |
Headers | show |
On Tuesday 2015-02-17 00:05, Mikko Rapeli wrote: >Fixes userspace compilation errors like: > >error: field ‘in’ has incomplete type >struct in_addr in; > >+#include <linux/if.h> Patch 36/45 included linux/in.h instead of linux/if.h for addressing "in has incomplete type". Should this be used here too? -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 17, 2015 at 01:02:50AM +0100, Jan Engelhardt wrote: > On Tuesday 2015-02-17 00:05, Mikko Rapeli wrote: > > >Fixes userspace compilation errors like: > > > >error: field ‘in’ has incomplete type > >struct in_addr in; > > > >+#include <linux/if.h> > > Patch 36/45 included linux/in.h instead of linux/if.h for addressing "in has incomplete > type". Should this be used here too? It could, yes. It seems I cut some corners since this was hiding behind it: In file included from ./linux/netfilter_bridge.h:11:0, from ./linux/netfilter_bridge.c:1: ./linux/if_pppox.h:42:11: error: ‘IFNAMSIZ’ undeclared here (not in a function) char dev[IFNAMSIZ]; /* Local device to use */ I'll fix these. -Mikko -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h index a5eda6d..5bb0528 100644 --- a/include/uapi/linux/netfilter_bridge.h +++ b/include/uapi/linux/netfilter_bridge.h @@ -4,6 +4,7 @@ /* bridge-specific defines for netfilter. */ +#include <linux/if.h> #include <linux/netfilter.h> #include <linux/if_ether.h> #include <linux/if_vlan.h>
Fixes userspace compilation errors like: error: field ‘in’ has incomplete type struct in_addr in; Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> --- include/uapi/linux/netfilter_bridge.h | 1 + 1 file changed, 1 insertion(+)