diff options
author | Florian Westphal <fw@strlen.de> | 2018-05-08 10:05:38 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-05-17 13:52:04 +0200 |
commit | 01cd267bff52619a53fa05c930ea5ed53493d21a (patch) | |
tree | 2a7e09563746a5af23e6a3f7310f5f3924096f94 /include/uapi/linux/netfilter/nf_osf.h | |
parent | net: ipv4: ipconfig: fix unused variable (diff) | |
download | linux-dev-01cd267bff52619a53fa05c930ea5ed53493d21a.tar.xz linux-dev-01cd267bff52619a53fa05c930ea5ed53493d21a.zip |
netfilter: fix fallout from xt/nf osf separation
Stephen Rothwell says:
today's linux-next build (x86_64 allmodconfig) produced this warning:
./usr/include/linux/netfilter/nf_osf.h:25: found __[us]{8,16,32,64} type without #include <linux/types.h>
Fix that up and also move kernel-private struct out of uapi (it was not
exposed in any released kernel version).
tested via allmodconfig build + make headers_check.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi/linux/netfilter/nf_osf.h')
-rw-r--r-- | include/uapi/linux/netfilter/nf_osf.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/uapi/linux/netfilter/nf_osf.h b/include/uapi/linux/netfilter/nf_osf.h index 45376eae31ef..8f2f2f403183 100644 --- a/include/uapi/linux/netfilter/nf_osf.h +++ b/include/uapi/linux/netfilter/nf_osf.h @@ -1,6 +1,8 @@ #ifndef _NF_OSF_H #define _NF_OSF_H +#include <linux/types.h> + #define MAXGENRELEN 32 #define NF_OSF_GENRE (1 << 0) @@ -57,12 +59,6 @@ struct nf_osf_user_finger { struct nf_osf_opt opt[MAX_IPOPTLEN]; }; -struct nf_osf_finger { - struct rcu_head rcu_head; - struct list_head finger_entry; - struct nf_osf_user_finger finger; -}; - struct nf_osf_nlmsg { struct nf_osf_user_finger f; struct iphdr ip; |