Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nf_conntrack_amanda.c

diff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntrack_amanda.c
index e0212b5494b13cc8546b6cd6357593e91f4a9a06..c514fe6033d254280f6760a3fe6d1c1f37185e1c 100644 (file)
--- a/net/netfilter/nf_conntrack_amanda.c
+++ b/net/netfilter/nf_conntrack_amanda.c
@@ -155,8 +155,7 @@ static int amanda_help(struct sk_buff *skb,
                                  IPPROTO_TCP, NULL, &port);
 
                nf_nat_amanda = rcu_dereference(nf_nat_amanda_hook);
-               if (nf_nat_amanda && nf_ct_l3num(ct) == NFPROTO_IPV4 &&
-                   ct->status & IPS_NAT_MASK)
+               if (nf_nat_amanda && ct->status & IPS_NAT_MASK)
                        ret = nf_nat_amanda(skb, ctinfo, protoff,
                                            off - dataoff, len, exp);
                else if (nf_ct_expect_related(exp) != 0)