projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'battery/for-next'
[deliverable/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_log_ipv4.c
diff --git
a/net/ipv4/netfilter/nf_log_ipv4.c
b/net/ipv4/netfilter/nf_log_ipv4.c
index 076aadda04737eb7fa829adc14eb98ea37867655..20f225593a8b14563d68f13685d571aa2cfc47b8 100644
(file)
--- a/
net/ipv4/netfilter/nf_log_ipv4.c
+++ b/
net/ipv4/netfilter/nf_log_ipv4.c
@@
-347,8
+347,7
@@
static struct nf_logger nf_ip_logger __read_mostly = {
static int __net_init nf_log_ipv4_net_init(struct net *net)
{
- nf_log_set(net, NFPROTO_IPV4, &nf_ip_logger);
- return 0;
+ return nf_log_set(net, NFPROTO_IPV4, &nf_ip_logger);
}
static void __net_exit nf_log_ipv4_net_exit(struct net *net)
This page took
0.0270899999999999 seconds
and
5
git commands to generate.