diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-29 06:15:21 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-29 16:46:02 -0700 |
commit | a31f2d17b331db970259e875b7223d3aba7e3821 (patch) | |
tree | 0d10021be81446ab360f4240b0d16729f518387f /kernel/audit.c | |
parent | dd7f36ba3ce17d4fe85987d83efd5901b0935816 (diff) | |
download | linux-stable-a31f2d17b331db970259e875b7223d3aba7e3821.tar.gz linux-stable-a31f2d17b331db970259e875b7223d3aba7e3821.tar.bz2 linux-stable-a31f2d17b331db970259e875b7223d3aba7e3821.zip |
netlink: add netlink_kernel_cfg parameter to netlink_kernel_create
This patch adds the following structure:
struct netlink_kernel_cfg {
unsigned int groups;
void (*input)(struct sk_buff *skb);
struct mutex *cb_mutex;
};
That can be passed to netlink_kernel_create to set optional configurations
for netlink kernel sockets.
I've populated this structure by looking for NULL and zero parameters at the
existing code. The remaining parameters that always need to be set are still
left in the original interface.
That includes optional parameters for the netlink socket creation. This allows
easy extensibility of this interface in the future.
This patch also adapts all callers to use this new interface.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r-- | kernel/audit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 30b252a1fb61..4a3f28d2ca65 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -962,14 +962,17 @@ static void audit_receive(struct sk_buff *skb) static int __init audit_init(void) { int i; + struct netlink_kernel_cfg cfg = { + .input = audit_receive, + }; if (audit_initialized == AUDIT_DISABLED) return 0; printk(KERN_INFO "audit: initializing netlink socket (%s)\n", audit_default ? "enabled" : "disabled"); - audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0, - audit_receive, NULL, THIS_MODULE); + audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, + THIS_MODULE, &cfg); if (!audit_sock) audit_panic("cannot initialize netlink socket"); else |