diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 11:35:11 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 11:35:11 +0200 |
| commit | cfd6e3d74751b62b6d0844e24c911776e40a0135 (patch) | |
| tree | 474f3f6d23cc46964b9fb0649764172d3454e3bd /net/ipv4 | |
| parent | 9174c1538fffbb5dddab99563eac6b3d8b212277 (diff) | |
| download | linux-3.10-cfd6e3d74751b62b6d0844e24c911776e40a0135.tar.gz linux-3.10-cfd6e3d74751b62b6d0844e24c911776e40a0135.tar.bz2 linux-3.10-cfd6e3d74751b62b6d0844e24c911776e40a0135.zip | |
netfilter: netns nat: PPTP NAT in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_pptp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c index e4bdddc6034..9eb171056c6 100644 --- a/net/ipv4/netfilter/nf_nat_pptp.c +++ b/net/ipv4/netfilter/nf_nat_pptp.c @@ -40,6 +40,7 @@ MODULE_ALIAS("ip_nat_pptp"); static void pptp_nat_expected(struct nf_conn *ct, struct nf_conntrack_expect *exp) { + struct net *net = nf_ct_net(ct); const struct nf_conn *master = ct->master; struct nf_conntrack_expect *other_exp; struct nf_conntrack_tuple t; @@ -73,7 +74,7 @@ static void pptp_nat_expected(struct nf_conn *ct, pr_debug("trying to unexpect other dir: "); nf_ct_dump_tuple_ip(&t); - other_exp = nf_ct_expect_find_get(&init_net, &t); + other_exp = nf_ct_expect_find_get(net, &t); if (other_exp) { nf_ct_unexpect_related(other_exp); nf_ct_expect_put(other_exp); |