[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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 8 deletions

diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index b465e24e90b3..5bb9cd349350 100644
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -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)