projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[deliverable/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_nat_ftp.c
diff --git
a/net/ipv4/netfilter/nf_nat_ftp.c
b/net/ipv4/netfilter/nf_nat_ftp.c
index e1a16d3ea4cbaba6df03e47ab57f590f4a140240..a1d5d58a58bf904b25115fe8dff4397e4d541a29 100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_ftp.c
+++ b/
net/ipv4/netfilter/nf_nat_ftp.c
@@
-147,7
+147,7
@@
static void __exit nf_nat_ftp_fini(void)
static int __init nf_nat_ftp_init(void)
{
- BUG_ON(
rcu_dereference(nf_nat_ftp_hook)
);
+ BUG_ON(
nf_nat_ftp_hook != NULL
);
rcu_assign_pointer(nf_nat_ftp_hook, nf_nat_ftp);
return 0;
}
This page took
0.045203 seconds
and
5
git commands to generate.