diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2015-09-02 21:54:02 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-03 02:28:06 +0300 |
| commit | a82b0e63917f597c546cd479acc938e08ac54f2d (patch) | |
| tree | 364e8440142fa32507c2c35788b1446c18375013 /net | |
| parent | ed63f1dcd5788d36f942fbcce350742385e3e18c (diff) | |
| download | linux-a82b0e63917f597c546cd479acc938e08ac54f2d.tar.xz | |
netfilter: nf_dup{4, 6}: fix build error when nf_conntrack disabled
While testing various Kconfig options on another issue, I found that
the following one triggers as well on allmodconfig and nf_conntrack
disabled:
net/ipv4/netfilter/nf_dup_ipv4.c: In function ‘nf_dup_ipv4’:
net/ipv4/netfilter/nf_dup_ipv4.c:72:20: error: ‘nf_skb_duplicated’ undeclared (first use in this function)
if (this_cpu_read(nf_skb_duplicated))
[...]
net/ipv6/netfilter/nf_dup_ipv6.c: In function ‘nf_dup_ipv6’:
net/ipv6/netfilter/nf_dup_ipv6.c:66:20: error: ‘nf_skb_duplicated’ undeclared (first use in this function)
if (this_cpu_read(nf_skb_duplicated))
Fix it by including directly the header where it is defined.
Fixes: bbde9fc1824a ("netfilter: factor out packet duplication for IPv4/IPv6")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/nf_dup_ipv4.c | 1 | ||||
| -rw-r--r-- | net/ipv6/netfilter/nf_dup_ipv6.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c index b5bb37564b0e..2d79e6e8d934 100644 --- a/net/ipv4/netfilter/nf_dup_ipv4.c +++ b/net/ipv4/netfilter/nf_dup_ipv4.c @@ -13,6 +13,7 @@ #include <linux/percpu.h> #include <linux/route.h> #include <linux/skbuff.h> +#include <linux/netfilter.h> #include <net/checksum.h> #include <net/icmp.h> #include <net/ip.h> diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c index c5c87e921ccd..c8ab626556a0 100644 --- a/net/ipv6/netfilter/nf_dup_ipv6.c +++ b/net/ipv6/netfilter/nf_dup_ipv6.c @@ -11,6 +11,7 @@ #include <linux/module.h> #include <linux/percpu.h> #include <linux/skbuff.h> +#include <linux/netfilter.h> #include <net/ipv6.h> #include <net/ip6_route.h> #include <net/netfilter/ipv6/nf_dup_ipv6.h> |