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 'pwm/for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[linux-2.6-microblaze.git]
/
net
/
netfilter
/
nf_conntrack_h323_main.c
diff --git
a/net/netfilter/nf_conntrack_h323_main.c
b/net/netfilter/nf_conntrack_h323_main.c
index
5c0db5c
..
f65d936
100644
(file)
--- a/
net/netfilter/nf_conntrack_h323_main.c
+++ b/
net/netfilter/nf_conntrack_h323_main.c
@@
-736,7
+736,7
@@
static int callforward_do_filter(struct net *net,
const struct nf_afinfo *afinfo;
int ret = 0;
- /* rcu_read_lock()ed by nf_hook_
slow()
*/
+ /* rcu_read_lock()ed by nf_hook_
thresh
*/
afinfo = nf_get_afinfo(family);
if (!afinfo)
return 0;