OSDN Git Service

netfilter: uapi: fix linux/netfilter/nf_osf.h userspace compilation errors
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 13 Aug 2018 15:43:36 +0000 (18:43 +0300)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 16 Aug 2018 17:37:09 +0000 (19:37 +0200)
commitcdb2f401246ef70b37eeedd9c6f9c28d611d8255
treede5d1d17c01563cf139fd5a86f29c2c92f4f6ea8
parent3206c516ce4e4b56d7b99341814c261ec190f6df
netfilter: 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")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/uapi/linux/netfilter/nfnetlink_osf.h
include/uapi/linux/netfilter/xt_osf.h