Skip to contentSkip to conversation

uapi: fix linux/netfilter/nf_osf.h userspace compilation errors

PATCH New Dmitry V. Levin 1 participant 1 message Aug 13, 2018 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uapi: fix linux/netfilter/nf_osf.h userspace compilation errors

Move inclusion of <linux/ip.h> and <linux/tcp.h> from linux/netfilter/xt_osf.h to linux/netfilter/nf_osf.h to fix the following linux/netfilter/nf_osf.h userspace compilation errors:

/usr/include/linux/netfilter/nf_osf.h:59:24: error: 'MAX_IPOPTLEN' undeclared here (not in a function)
struct nf_osf_opt opt[MAX_IPOPTLEN];
/usr/include/linux/netfilter/nf_osf.h:64:17: error: field 'ip' has incomplete type
struct iphdr ip;
/usr/include/linux/netfilter/nf_osf.h:65:18: error: field 'tcp' has incomplete type
struct tcphdr tcp;

Fixes bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
Cc <[email protected]> # v4.18
---
 include/uapi/linux/netfilter/nf_osf.h | 2 ++
 include/uapi/linux/netfilter/xt_osf.h | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/netfilter/nf_osf.h +2 -0
index 8f2f2f403183..eb5c4e20bec0 100644
@@ -2,6 +2,8 @@
 #define _NF_OSF_H
 
 #include <linux/types.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
 
 #define MAXGENRELEN	32
 
include/uapi/linux/netfilter/xt_osf.h +0 -2
index 72956eceeb09..f1abe4c6f59d 100644
@@ -21,8 +21,6 @@
 #define _XT_OSF_H
 
 #include <linux/types.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
 #include <linux/netfilter/nf_osf.h>
 
 #define XT_OSF_GENRE		NF_OSF_GENRE
Signature · 1 line
ldv