projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0891147
)
netfilter: nf_ct_tcp: missing per-net support for cttimeout
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Fri, 29 Jun 2012 05:23:25 +0000
(
05:23
+0000)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 4 Jul 2012 17:37:42 +0000
(19:37 +0200)
This patch adds missing per-net support for the cttimeout
infrastructure to TCP.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Gao feng <gaofeng@cn.fujitsu.com>
net/netfilter/nf_conntrack_proto_tcp.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_proto_tcp.c
b/net/netfilter/nf_conntrack_proto_tcp.c
index
07e56ea
..
a5ac11e
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_tcp.c
+++ b/
net/netfilter/nf_conntrack_proto_tcp.c
@@
-821,7
+821,7
@@
static int tcp_error(struct net *net, struct nf_conn *tmpl,
static unsigned int *tcp_get_timeouts(struct net *net)
{
- return tcp_timeouts;
+ return tcp_
pernet(net)->
timeouts;
}
/* Returns verdict for packet, or -1 for invalid. */