Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

3 files changed, 108 insertions, 0 deletions

diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h
new file mode 100644
index 000000000000..c7f4d43618fd
--- /dev/null
+++ b/include/linux/tc_ematch/tc_em_cmp.h
@@ -0,0 +1,26 @@
+#ifndef __LINUX_TC_EM_CMP_H
+#define __LINUX_TC_EM_CMP_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
new file mode 100644
index 000000000000..aa6b48bb4dcd
--- /dev/null
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -0,0 +1,69 @@
+#ifndef __LINUX_TC_EM_META_H
+#define __LINUX_TC_EM_META_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_INDEV,
+        TCF_META_ID_REALDEV,
+        TCF_META_ID_PRIORITY,
+        TCF_META_ID_PROTOCOL,
+        TCF_META_ID_SECURITY,
+        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_TCVERDICT,
+        TCF_META_ID_TCCLASSID,
+        TCF_META_ID_RTCLASSID,
+        TCF_META_ID_RTIIF,
+        __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
new file mode 100644
index 000000000000..f19d1f58ec9d
--- /dev/null
+++ b/include/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/pkt_cls.h>
+
+struct tcf_em_nbyte
+{
+        __u16           off;
+        __u16           len:12;
+        __u8            layer:4;
+};
+
+#endif