diff options
| author | Patrick McHardy <kaber@trash.net> | 2012-08-26 19:14:20 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-08-30 03:00:20 +0200 |
| commit | d33cbeeb1a46a7dc82fe9f53e40a742ce0c67c79 (patch) | |
| tree | e9a6c914878edfd0f74cb48772a599aadfd732f0 /net/netfilter/nf_conntrack_ftp.c | |
| parent | ed72d9e294a66fce8f4b4a2f6c8c011b22f1a87c (diff) | |
| download | linux-d33cbeeb1a46a7dc82fe9f53e40a742ce0c67c79.tar.gz | |
netfilter: nf_nat: support IPv6 in FTP NAT helper
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_ftp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_ftp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index c0f4a5ba9016f..f8cc26ad4456a 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -488,8 +488,7 @@ static int help(struct sk_buff *skb, /* Now, NAT might want to mangle the packet, and register the * (possibly changed) expectation itself. */ nf_nat_ftp = rcu_dereference(nf_nat_ftp_hook); - if (nf_nat_ftp && nf_ct_l3num(ct) == NFPROTO_IPV4 && - ct->status & IPS_NAT_MASK) + if (nf_nat_ftp && ct->status & IPS_NAT_MASK) ret = nf_nat_ftp(skb, ctinfo, search[dir][i].ftptype, protoff, matchoff, matchlen, exp); else { |