openvswitch: Add basic MPLS support to kernel

Allow datapath to recognize and extract MPLS labels into flow keys
and execute actions which push, pop, and set labels on packets.

Based heavily on work by Leo Alterman, Ravi K, Isaku Yamahata and Joe Stringer.

Cc: Ravi K <rkerur@gmail.com>
Cc: Leo Alterman <lalterman@nicira.com>
Cc: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 71813318c8c7..4962bee81a11 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -102,12 +102,17 @@ struct sw_flow_key {
                 __be16 tci;             /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
                 __be16 type;            /* Ethernet frame type. */
         } eth;
-        struct {
-                u8     proto;           /* IP protocol or lower 8 bits of ARP opcode. */
-                u8     tos;             /* IP ToS. */
-                u8     ttl;             /* IP TTL/hop limit. */
-                u8     frag;            /* One of OVS_FRAG_TYPE_*. */
-        } ip;
+        union {
+                struct {
+                        __be32 top_lse; /* top label stack entry */
+                } mpls;
+                struct {
+                        u8     proto;   /* IP protocol or lower 8 bits of ARP opcode. */
+                        u8     tos;         /* IP ToS. */
+                        u8     ttl;         /* IP TTL/hop limit. */
+                        u8     frag;    /* One of OVS_FRAG_TYPE_*. */
+                } ip;
+        };
         struct {
                 __be16 src;             /* TCP/UDP/SCTP source port. */
                 __be16 dst;             /* TCP/UDP/SCTP destination port. */