Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Florian Westphal and committed by
Pablo Neira Ayuso
01cd267b 289e1f4e

+8 -6
+6
include/linux/netfilter/nf_osf.h
··· 21 21 FMATCH_OPT_WRONG, 22 22 }; 23 23 24 + struct nf_osf_finger { 25 + struct rcu_head rcu_head; 26 + struct list_head finger_entry; 27 + struct nf_osf_user_finger finger; 28 + }; 29 + 24 30 bool nf_osf_match(const struct sk_buff *skb, u_int8_t family, 25 31 int hooknum, struct net_device *in, struct net_device *out, 26 32 const struct nf_osf_info *info, struct net *net,
+2 -6
include/uapi/linux/netfilter/nf_osf.h
··· 1 1 #ifndef _NF_OSF_H 2 2 #define _NF_OSF_H 3 3 4 + #include <linux/types.h> 5 + 4 6 #define MAXGENRELEN 32 5 7 6 8 #define NF_OSF_GENRE (1 << 0) ··· 57 55 58 56 /* MAX_IPOPTLEN is maximum if all options are NOPs or EOLs */ 59 57 struct nf_osf_opt opt[MAX_IPOPTLEN]; 60 - }; 61 - 62 - struct nf_osf_finger { 63 - struct rcu_head rcu_head; 64 - struct list_head finger_entry; 65 - struct nf_osf_user_finger finger; 66 58 }; 67 59 68 60 struct nf_osf_nlmsg {