UAPI: (Scripted) Disintegrate include/linux/tc_ematch

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>

diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
index 4a58a1c32a0004c7b774f161636e3b98bc6d7a66..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/include/linux/tc_ematch/Kbuild
+++ b/include/linux/tc_ematch/Kbuild
@@ -1,4 +0,0 @@
-header-y += tc_em_cmp.h
-header-y += tc_em_meta.h
-header-y += tc_em_nbyte.h
-header-y += tc_em_text.h

diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h
deleted file mode 100644 (file)
index f34bb1b..0000000
--- a/include/linux/tc_ematch/tc_em_cmp.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __LINUX_TC_EM_CMP_H
-#define __LINUX_TC_EM_CMP_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-struct tcf_em_cmp {
-       __u32           val;
-       __u32           mask;
-       __u16           off;
-       __u8            align:4;
-       __u8            flags:4;
-       __u8            layer:4;
-       __u8            opnd:4;
-};
-
-enum {
-       TCF_EM_ALIGN_U8  = 1,
-       TCF_EM_ALIGN_U16 = 2,
-       TCF_EM_ALIGN_U32 = 4
-};
-
-#define TCF_EM_CMP_TRANS       1
-
-#endif

diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
deleted file mode 100644 (file)
index b11f8ce..0000000
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef __LINUX_TC_EM_META_H
-#define __LINUX_TC_EM_META_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-enum {
-       TCA_EM_META_UNSPEC,
-       TCA_EM_META_HDR,
-       TCA_EM_META_LVALUE,
-       TCA_EM_META_RVALUE,
-       __TCA_EM_META_MAX
-};
-#define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1)
-
-struct tcf_meta_val {
-       __u16                   kind;
-       __u8                    shift;
-       __u8                    op;
-};
-
-#define TCF_META_TYPE_MASK     (0xf << 12)
-#define TCF_META_TYPE(kind)    (((kind) & TCF_META_TYPE_MASK) >> 12)
-#define TCF_META_ID_MASK       0x7ff
-#define TCF_META_ID(kind)      ((kind) & TCF_META_ID_MASK)
-
-enum {
-       TCF_META_TYPE_VAR,
-       TCF_META_TYPE_INT,
-       __TCF_META_TYPE_MAX
-};
-#define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1)
-
-enum {
-       TCF_META_ID_VALUE,
-       TCF_META_ID_RANDOM,
-       TCF_META_ID_LOADAVG_0,
-       TCF_META_ID_LOADAVG_1,
-       TCF_META_ID_LOADAVG_2,
-       TCF_META_ID_DEV,
-       TCF_META_ID_PRIORITY,
-       TCF_META_ID_PROTOCOL,
-       TCF_META_ID_PKTTYPE,
-       TCF_META_ID_PKTLEN,
-       TCF_META_ID_DATALEN,
-       TCF_META_ID_MACLEN,
-       TCF_META_ID_NFMARK,
-       TCF_META_ID_TCINDEX,
-       TCF_META_ID_RTCLASSID,
-       TCF_META_ID_RTIIF,
-       TCF_META_ID_SK_FAMILY,
-       TCF_META_ID_SK_STATE,
-       TCF_META_ID_SK_REUSE,
-       TCF_META_ID_SK_BOUND_IF,
-       TCF_META_ID_SK_REFCNT,
-       TCF_META_ID_SK_SHUTDOWN,
-       TCF_META_ID_SK_PROTO,
-       TCF_META_ID_SK_TYPE,
-       TCF_META_ID_SK_RCVBUF,
-       TCF_META_ID_SK_RMEM_ALLOC,
-       TCF_META_ID_SK_WMEM_ALLOC,
-       TCF_META_ID_SK_OMEM_ALLOC,
-       TCF_META_ID_SK_WMEM_QUEUED,
-       TCF_META_ID_SK_RCV_QLEN,
-       TCF_META_ID_SK_SND_QLEN,
-       TCF_META_ID_SK_ERR_QLEN,
-       TCF_META_ID_SK_FORWARD_ALLOCS,
-       TCF_META_ID_SK_SNDBUF,
-       TCF_META_ID_SK_ALLOCS,
-       __TCF_META_ID_SK_ROUTE_CAPS,    /* unimplemented but in ABI already */
-       TCF_META_ID_SK_HASH,
-       TCF_META_ID_SK_LINGERTIME,
-       TCF_META_ID_SK_ACK_BACKLOG,
-       TCF_META_ID_SK_MAX_ACK_BACKLOG,
-       TCF_META_ID_SK_PRIO,
-       TCF_META_ID_SK_RCVLOWAT,
-       TCF_META_ID_SK_RCVTIMEO,
-       TCF_META_ID_SK_SNDTIMEO,
-       TCF_META_ID_SK_SENDMSG_OFF,
-       TCF_META_ID_SK_WRITE_PENDING,
-       TCF_META_ID_VLAN_TAG,
-       TCF_META_ID_RXHASH,
-       __TCF_META_ID_MAX
-};
-#define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)
-
-struct tcf_meta_hdr {
-       struct tcf_meta_val     left;
-       struct tcf_meta_val     right;
-};
-
-#endif

diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/linux/tc_ematch/tc_em_nbyte.h
deleted file mode 100644 (file)
index 7172cfb..0000000
--- a/include/linux/tc_ematch/tc_em_nbyte.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __LINUX_TC_EM_NBYTE_H
-#define __LINUX_TC_EM_NBYTE_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-struct tcf_em_nbyte {
-       __u16           off;
-       __u16           len:12;
-       __u8            layer:4;
-};
-
-#endif

diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h
deleted file mode 100644 (file)
index 5aac404..0000000
--- a/include/linux/tc_ematch/tc_em_text.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __LINUX_TC_EM_TEXT_H
-#define __LINUX_TC_EM_TEXT_H
-
-#include <linux/types.h>
-#include <linux/pkt_cls.h>
-
-#define TC_EM_TEXT_ALGOSIZ     16
-
-struct tcf_em_text {
-       char            algo[TC_EM_TEXT_ALGOSIZ];
-       __u16           from_offset;
-       __u16           to_offset;
-       __u16           pattern_len;
-       __u8            from_layer:4;
-       __u8            to_layer:4;
-       __u8            pad;
-};
-
-#endif

diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild
index aafaa5aa54d46bb9a93a8137a22344408298223f..53fca39255351730cfd7384d4ca4ccefbb6414c1 100644 (file)
--- a/include/uapi/linux/tc_ematch/Kbuild
+++ b/include/uapi/linux/tc_ematch/Kbuild
@@ -1 +1,5 @@
 # UAPI Header export list
+header-y += tc_em_cmp.h
+header-y += tc_em_meta.h
+header-y += tc_em_nbyte.h
+header-y += tc_em_text.h

diff --git a/include/uapi/linux/tc_ematch/tc_em_cmp.h b/include/uapi/linux/tc_ematch/tc_em_cmp.h
new file mode 100644 (file)
index 0000000..f34bb1b
--- /dev/null
+++ b/include/uapi/linux/tc_ematch/tc_em_cmp.h
@@ -0,0 +1,25 @@
+#ifndef __LINUX_TC_EM_CMP_H
+#define __LINUX_TC_EM_CMP_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+struct tcf_em_cmp {
+       __u32           val;
+       __u32           mask;
+       __u16           off;
+       __u8            align:4;
+       __u8            flags:4;
+       __u8            layer:4;
+       __u8            opnd:4;
+};
+
+enum {
+       TCF_EM_ALIGN_U8  = 1,
+       TCF_EM_ALIGN_U16 = 2,
+       TCF_EM_ALIGN_U32 = 4
+};
+
+#define TCF_EM_CMP_TRANS       1
+
+#endif

diff --git a/include/uapi/linux/tc_ematch/tc_em_meta.h b/include/uapi/linux/tc_ematch/tc_em_meta.h
new file mode 100644 (file)
index 0000000..b11f8ce
--- /dev/null
+++ b/include/uapi/linux/tc_ematch/tc_em_meta.h
@@ -0,0 +1,92 @@
+#ifndef __LINUX_TC_EM_META_H
+#define __LINUX_TC_EM_META_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+enum {
+       TCA_EM_META_UNSPEC,
+       TCA_EM_META_HDR,
+       TCA_EM_META_LVALUE,
+       TCA_EM_META_RVALUE,
+       __TCA_EM_META_MAX
+};
+#define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1)
+
+struct tcf_meta_val {
+       __u16                   kind;
+       __u8                    shift;
+       __u8                    op;
+};
+
+#define TCF_META_TYPE_MASK     (0xf << 12)
+#define TCF_META_TYPE(kind)    (((kind) & TCF_META_TYPE_MASK) >> 12)
+#define TCF_META_ID_MASK       0x7ff
+#define TCF_META_ID(kind)      ((kind) & TCF_META_ID_MASK)
+
+enum {
+       TCF_META_TYPE_VAR,
+       TCF_META_TYPE_INT,
+       __TCF_META_TYPE_MAX
+};
+#define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1)
+
+enum {
+       TCF_META_ID_VALUE,
+       TCF_META_ID_RANDOM,
+       TCF_META_ID_LOADAVG_0,
+       TCF_META_ID_LOADAVG_1,
+       TCF_META_ID_LOADAVG_2,
+       TCF_META_ID_DEV,
+       TCF_META_ID_PRIORITY,
+       TCF_META_ID_PROTOCOL,
+       TCF_META_ID_PKTTYPE,
+       TCF_META_ID_PKTLEN,
+       TCF_META_ID_DATALEN,
+       TCF_META_ID_MACLEN,
+       TCF_META_ID_NFMARK,
+       TCF_META_ID_TCINDEX,
+       TCF_META_ID_RTCLASSID,
+       TCF_META_ID_RTIIF,
+       TCF_META_ID_SK_FAMILY,
+       TCF_META_ID_SK_STATE,
+       TCF_META_ID_SK_REUSE,
+       TCF_META_ID_SK_BOUND_IF,
+       TCF_META_ID_SK_REFCNT,
+       TCF_META_ID_SK_SHUTDOWN,
+       TCF_META_ID_SK_PROTO,
+       TCF_META_ID_SK_TYPE,
+       TCF_META_ID_SK_RCVBUF,
+       TCF_META_ID_SK_RMEM_ALLOC,
+       TCF_META_ID_SK_WMEM_ALLOC,
+       TCF_META_ID_SK_OMEM_ALLOC,
+       TCF_META_ID_SK_WMEM_QUEUED,
+       TCF_META_ID_SK_RCV_QLEN,
+       TCF_META_ID_SK_SND_QLEN,
+       TCF_META_ID_SK_ERR_QLEN,
+       TCF_META_ID_SK_FORWARD_ALLOCS,
+       TCF_META_ID_SK_SNDBUF,
+       TCF_META_ID_SK_ALLOCS,
+       __TCF_META_ID_SK_ROUTE_CAPS,    /* unimplemented but in ABI already */
+       TCF_META_ID_SK_HASH,
+       TCF_META_ID_SK_LINGERTIME,
+       TCF_META_ID_SK_ACK_BACKLOG,
+       TCF_META_ID_SK_MAX_ACK_BACKLOG,
+       TCF_META_ID_SK_PRIO,
+       TCF_META_ID_SK_RCVLOWAT,
+       TCF_META_ID_SK_RCVTIMEO,
+       TCF_META_ID_SK_SNDTIMEO,
+       TCF_META_ID_SK_SENDMSG_OFF,
+       TCF_META_ID_SK_WRITE_PENDING,
+       TCF_META_ID_VLAN_TAG,
+       TCF_META_ID_RXHASH,
+       __TCF_META_ID_MAX
+};
+#define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)
+
+struct tcf_meta_hdr {
+       struct tcf_meta_val     left;
+       struct tcf_meta_val     right;
+};
+
+#endif

diff --git a/include/uapi/linux/tc_ematch/tc_em_nbyte.h b/include/uapi/linux/tc_ematch/tc_em_nbyte.h
new file mode 100644 (file)
index 0000000..7172cfb
--- /dev/null
+++ b/include/uapi/linux/tc_ematch/tc_em_nbyte.h
@@ -0,0 +1,13 @@
+#ifndef __LINUX_TC_EM_NBYTE_H
+#define __LINUX_TC_EM_NBYTE_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+struct tcf_em_nbyte {
+       __u16           off;
+       __u16           len:12;
+       __u8            layer:4;
+};
+
+#endif

diff --git a/include/uapi/linux/tc_ematch/tc_em_text.h b/include/uapi/linux/tc_ematch/tc_em_text.h
new file mode 100644 (file)
index 0000000..5aac404
--- /dev/null
+++ b/include/uapi/linux/tc_ematch/tc_em_text.h
@@ -0,0 +1,19 @@
+#ifndef __LINUX_TC_EM_TEXT_H
+#define __LINUX_TC_EM_TEXT_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+#define TC_EM_TEXT_ALGOSIZ     16
+
+struct tcf_em_text {
+       char            algo[TC_EM_TEXT_ALGOSIZ];
+       __u16           from_offset;
+       __u16           to_offset;
+       __u16           pattern_len;
+       __u8            from_layer:4;
+       __u8            to_layer:4;
+       __u8            pad;
+};
+
+#endif