projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9174c15
)
netfilter: netns nat: PPTP NAT in netns
author
Alexey Dobriyan
<adobriyan@gmail.com>
Wed, 8 Oct 2008 09:35:11 +0000
(11:35 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Wed, 8 Oct 2008 09:35:11 +0000
(11:35 +0200)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/ipv4/netfilter/nf_nat_pptp.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ipv4/netfilter/nf_nat_pptp.c
b/net/ipv4/netfilter/nf_nat_pptp.c
index e4bdddc60343714098912237cc2983038a5e8322..9eb171056c6319cc4d240da4abf783181b93a082 100644
(file)
--- 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);