projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: nf_log: move logging stuff to seperate header
[deliverable/linux.git]
/
net
/
bridge
/
netfilter
/
ebt_ulog.c
diff --git
a/net/bridge/netfilter/ebt_ulog.c
b/net/bridge/netfilter/ebt_ulog.c
index 204c968fa86dfe6cd8fa96cf7725880548cbb074..1b9ca07f44ffbabbb7a7dc3238b007397e4fcd9d 100644
(file)
--- a/
net/bridge/netfilter/ebt_ulog.c
+++ b/
net/bridge/netfilter/ebt_ulog.c
@@
-38,6
+38,7
@@
#include <linux/netdevice.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_ulog.h>
#include <linux/netdevice.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_ulog.h>
+#include <net/netfilter/nf_log.h>
#include <net/sock.h>
#include "../br_private.h"
#include <net/sock.h>
#include "../br_private.h"
@@
-300,8
+301,9
@@
static int __init ebt_ulog_init(void)
spin_lock_init(&ulog_buffers[i].lock);
}
spin_lock_init(&ulog_buffers[i].lock);
}
- ebtulognl = netlink_kernel_create(NETLINK_NFLOG, EBT_ULOG_MAXNLGROUPS,
- NULL, NULL, THIS_MODULE);
+ ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
+ EBT_ULOG_MAXNLGROUPS, NULL, NULL,
+ THIS_MODULE);
if (!ebtulognl)
ret = -ENOMEM;
else if ((ret = ebt_register_watcher(&ulog)))
if (!ebtulognl)
ret = -ENOMEM;
else if ((ret = ebt_register_watcher(&ulog)))
This page took
0.034451 seconds
and
5
git commands to generate.