diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 05:35:11 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:11 -0400 |
commit | cfd6e3d74751b62b6d0844e24c911776e40a0135 (patch) | |
tree | 474f3f6d23cc46964b9fb0649764172d3454e3bd /net/ipv4 | |
parent | 9174c1538fffbb5dddab99563eac6b3d8b212277 (diff) |
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 e4bdddc60343..9eb171056c63 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"); | |||
40 | static void pptp_nat_expected(struct nf_conn *ct, | 40 | static void pptp_nat_expected(struct nf_conn *ct, |
41 | struct nf_conntrack_expect *exp) | 41 | struct nf_conntrack_expect *exp) |
42 | { | 42 | { |
43 | struct net *net = nf_ct_net(ct); | ||
43 | const struct nf_conn *master = ct->master; | 44 | const struct nf_conn *master = ct->master; |
44 | struct nf_conntrack_expect *other_exp; | 45 | struct nf_conntrack_expect *other_exp; |
45 | struct nf_conntrack_tuple t; | 46 | struct nf_conntrack_tuple t; |
@@ -73,7 +74,7 @@ static void pptp_nat_expected(struct nf_conn *ct, | |||
73 | 74 | ||
74 | pr_debug("trying to unexpect other dir: "); | 75 | pr_debug("trying to unexpect other dir: "); |
75 | nf_ct_dump_tuple_ip(&t); | 76 | nf_ct_dump_tuple_ip(&t); |
76 | other_exp = nf_ct_expect_find_get(&init_net, &t); | 77 | other_exp = nf_ct_expect_find_get(net, &t); |
77 | if (other_exp) { | 78 | if (other_exp) { |
78 | nf_ct_unexpect_related(other_exp); | 79 | nf_ct_unexpect_related(other_exp); |
79 | nf_ct_expect_put(other_exp); | 80 | nf_ct_expect_put(other_exp); |