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

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

[NETFILTER]: {eb,ip6,ip}t_LOG: remove remains of LOG target overloading 



All LOG targets always use their internal logging function nowadays, so
remove the incorrect error message and handle real errors (!= -EEXIST)
by failing to load.

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

net/bridge/netfilter/ebt_log.c

+4 −8
Original line number Diff line number Diff line
@@ -196,14 +196,10 @@ static int __init ebt_log_init(void) 
	ret = ebt_register_watcher(&log);

	if (ret < 0)

		return ret;

	if (nf_log_register(PF_BRIDGE, &ebt_log_logger) < 0) {

		printk(KERN_WARNING "ebt_log: not logging via system console "

		       "since somebody else already registered for PF_INET\n");

		/* we cannot make module load fail here, since otherwise

		 * ebtables userspace would abort */

	}



	return 0;

	ret = nf_log_register(PF_BRIDGE, &ebt_log_logger);

	if (ret < 0 && ret != -EEXIST)

		ebt_unregister_watcher(&log);

	return ret;

}



static void __exit ebt_log_fini(void)

net/ipv4/netfilter/ipt_LOG.c

+4 −8
Original line number Diff line number Diff line
@@ -477,14 +477,10 @@ static int __init ipt_log_init(void) 
	ret = xt_register_target(&ipt_log_reg);

	if (ret < 0)

		return ret;

	if (nf_log_register(PF_INET, &ipt_log_logger) < 0) {

		printk(KERN_WARNING "ipt_LOG: not logging via system console "

		       "since somebody else already registered for PF_INET\n");

		/* we cannot make module load fail here, since otherwise

		 * iptables userspace would abort */

	}



	return 0;

	ret = nf_log_register(PF_INET, &ipt_log_logger);

	if (ret < 0 && ret != -EEXIST)

		xt_unregister_target(&ipt_log_reg);

	return ret;

}



static void __exit ipt_log_fini(void)

net/ipv6/netfilter/ip6t_LOG.c

+4 −8
Original line number Diff line number Diff line
@@ -490,14 +490,10 @@ static int __init ip6t_log_init(void) 
	ret = xt_register_target(&ip6t_log_reg);

	if (ret < 0)

		return ret;

	if (nf_log_register(PF_INET6, &ip6t_logger) < 0) {

		printk(KERN_WARNING "ip6t_LOG: not logging via system console "

		       "since somebody else already registered for PF_INET6\n");

		/* we cannot make module load fail here, since otherwise

		 * ip6tables userspace would abort */

	}



	return 0;

	ret = nf_log_register(PF_INET6, &ip6t_logger);

	if (ret < 0 && ret != -EEXIST)

		xt_unregister_target(&ip6t_log_reg);

	return ret;

}



static void __exit ip6t_log_fini(void)