projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
netfilter: conntrack: remove offload_pickup sysctl again
[linux-2.6-microblaze.git]
/
net
/
netfilter
/
nf_conntrack_proto_tcp.c
diff --git
a/net/netfilter/nf_conntrack_proto_tcp.c
b/net/netfilter/nf_conntrack_proto_tcp.c
index
3259416
..
af5115e
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_tcp.c
+++ b/
net/netfilter/nf_conntrack_proto_tcp.c
@@
-1478,7
+1478,6
@@
void nf_conntrack_tcp_init_net(struct net *net)
#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
tn->offload_timeout = 30 * HZ;
- tn->offload_pickup = 120 * HZ;
#endif
}