Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e92ad99c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_log: minor cleanups 



- rename nf_logging to nf_loggers since its an array of registered loggers

- rename nf_log_unregister_logger() to nf_log_unregister() to make it
  symetrical to nf_log_register() and convert all users

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b73534d

include/linux/netfilter.h

+1 −1
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ struct nf_logger { 


/* Function to register/unregister log function. */

int nf_log_register(int pf, struct nf_logger *logger);

void nf_log_unregister(struct nf_logger *logger);

void nf_log_unregister_pf(int pf);

void nf_log_unregister_logger(struct nf_logger *logger);



/* Calls the registered backend logging function */

void nf_log_packet(int pf,

net/bridge/netfilter/ebt_log.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int __init ebt_log_init(void) 


static void __exit ebt_log_fini(void)

{

	nf_log_unregister_logger(&ebt_log_logger);

	nf_log_unregister(&ebt_log_logger);

	ebt_unregister_watcher(&log);

}

net/bridge/netfilter/ebt_ulog.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static void __exit ebt_ulog_fini(void) 
	ebt_ulog_buff_t *ub;

	int i;



	nf_log_unregister_logger(&ebt_ulog_logger);

	nf_log_unregister(&ebt_ulog_logger);

	ebt_unregister_watcher(&ulog);

	for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {

		ub = &ulog_buffers[i];

net/ipv4/netfilter/ipt_LOG.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int __init ipt_log_init(void) 


static void __exit ipt_log_fini(void)

{

	nf_log_unregister_logger(&ipt_log_logger);

	nf_log_unregister(&ipt_log_logger);

	xt_unregister_target(&ipt_log_reg);

}

net/ipv4/netfilter/ipt_ULOG.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static void __exit ipt_ulog_fini(void) 
	DEBUGP("ipt_ULOG: cleanup_module\n");



	if (nflog)

		nf_log_unregister_logger(&ipt_ulog_logger);

		nf_log_unregister(&ipt_ulog_logger);

	xt_unregister_target(&ipt_ulog_reg);

	sock_release(nflognl->sk_socket);