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
Merge tag 'linux-kselftest-kunit-5.15-rc1' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-microblaze.git]
/
net
/
netfilter
/
nf_conntrack_proto_udp.c
diff --git
a/net/netfilter/nf_conntrack_proto_udp.c
b/net/netfilter/nf_conntrack_proto_udp.c
index
698fee4
..
f8e3c0d
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_udp.c
+++ b/
net/netfilter/nf_conntrack_proto_udp.c
@@
-271,7
+271,6
@@
void nf_conntrack_udp_init_net(struct net *net)
#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
un->offload_timeout = 30 * HZ;
- un->offload_pickup = 30 * HZ;
#endif
}