include: Add missing linux/netfilter/xt_LOG.h

When merging IP-version-specific LOG extensions, a dependency to that
header was introduced without caching it. Fix this and drop the now
unused ip{,6}t_LOG.h files.

Reported-by: Thomas Devoogdt <thomas@devoogdt.com>
Fixes: 87e4f1bf0b87b ("extensions: libip*t_LOG: Merge extensions")
Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/linux/netfilter/xt_LOG.h b/include/linux/netfilter/xt_LOG.h
new file mode 100644 (file)
index 0000000..167d4dd
--- /dev/null
+++ b/include/linux/netfilter/xt_LOG.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _XT_LOG_H
+#define _XT_LOG_H
+
+/* make sure not to change this without changing nf_log.h:NF_LOG_* (!) */
+#define XT_LOG_TCPSEQ          0x01    /* Log TCP sequence numbers */
+#define XT_LOG_TCPOPT          0x02    /* Log TCP options */
+#define XT_LOG_IPOPT           0x04    /* Log IP options */
+#define XT_LOG_UID             0x08    /* Log UID owning local socket */
+#define XT_LOG_NFLOG           0x10    /* Unsupported, don't reuse */
+#define XT_LOG_MACDECODE       0x20    /* Decode MAC header */
+#define XT_LOG_MASK            0x2f
+
+struct xt_log_info {
+       unsigned char level;
+       unsigned char logflags;
+       char prefix[30];
+};
+
+#endif /* _XT_LOG_H */

diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
deleted file mode 100644 (file)
index dcdbadf..0000000
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _IPT_LOG_H
-#define _IPT_LOG_H
-
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
-#define IPT_LOG_TCPSEQ         0x01    /* Log TCP sequence numbers */
-#define IPT_LOG_TCPOPT         0x02    /* Log TCP options */
-#define IPT_LOG_IPOPT          0x04    /* Log IP options */
-#define IPT_LOG_UID            0x08    /* Log UID owning local socket */
-#define IPT_LOG_NFLOG          0x10    /* Unsupported, don't reuse */
-#define IPT_LOG_MACDECODE      0x20    /* Decode MAC header */
-#define IPT_LOG_MASK           0x2f
-
-struct ipt_log_info {
-       unsigned char level;
-       unsigned char logflags;
-       char prefix[30];
-};
-
-#endif /*_IPT_LOG_H*/

diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
deleted file mode 100644 (file)
index 9dd5579..0000000
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _IP6T_LOG_H
-#define _IP6T_LOG_H
-
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
-#define IP6T_LOG_TCPSEQ                0x01    /* Log TCP sequence numbers */
-#define IP6T_LOG_TCPOPT                0x02    /* Log TCP options */
-#define IP6T_LOG_IPOPT         0x04    /* Log IP options */
-#define IP6T_LOG_UID           0x08    /* Log UID owning local socket */
-#define IP6T_LOG_NFLOG         0x10    /* Unsupported, don't use */
-#define IP6T_LOG_MACDECODE     0x20    /* Decode MAC header */
-#define IP6T_LOG_MASK          0x2f
-
-struct ip6t_log_info {
-       unsigned char level;
-       unsigned char logflags;
-       char prefix[30];
-};
-
-#endif /*_IPT_LOG_H*/