OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5c3a80
)
netfilter: netns nf_conntrack: H323 conntracking in netns
author
Alexey Dobriyan
<adobriyan@gmail.com>
Wed, 8 Oct 2008 09:35:09 +0000
(11:35 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Wed, 8 Oct 2008 09:35:09 +0000
(11:35 +0200)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/nf_conntrack_h323_main.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_h323_main.c
b/net/netfilter/nf_conntrack_h323_main.c
index
dfb826c
..
c1504f7
100644
(file)
--- a/
net/netfilter/nf_conntrack_h323_main.c
+++ b/
net/netfilter/nf_conntrack_h323_main.c
@@
-1210,6
+1210,7
@@
static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
union nf_inet_addr *addr,
__be16 port)
{
+ struct net *net = nf_ct_net(ct);
struct nf_conntrack_expect *exp;
struct nf_conntrack_tuple tuple;
@@
-1219,7
+1220,7
@@
static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
tuple.dst.u.tcp.port = port;
tuple.dst.protonum = IPPROTO_TCP;
- exp = __nf_ct_expect_find(
&init_
net, &tuple);
+ exp = __nf_ct_expect_find(net, &tuple);
if (exp && exp->master == ct)
return exp;
return NULL;