summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2014-06-24 20:56:57 +0900
committerJesse Gross <jesse@nicira.com>2014-06-24 16:02:02 -0700
commitccf4378615e93618e6ab8423fa1400b40876df91 (patch)
treedb5350feb49bf3f0e8a2b114b5d6f72d8655f4f1 /include/linux
parentb2f771efcabbd0b4e4c60d3126c45ba8b1c04e29 (diff)
downloadopenvswitch-ccf4378615e93618e6ab8423fa1400b40876df91.tar.gz
datapath: 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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/openvswitch.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index 4f8404546..bf27dcbea 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -319,15 +319,14 @@ enum ovs_key_attr {
OVS_KEY_ATTR_DP_HASH, /* u32 hash value. Value 0 indicates the hash
is not computed by the datapath. */
OVS_KEY_ATTR_RECIRC_ID, /* u32 recirc id */
+ OVS_KEY_ATTR_MPLS, /* array of struct ovs_key_mpls.
+ * The implementation may restrict
+ * the accepted length of the array. */
+
#ifdef __KERNEL__
/* Only used within kernel data path. */
OVS_KEY_ATTR_TUNNEL_INFO, /* struct ovs_tunnel_info */
#endif
- /* Experimental */
-
- OVS_KEY_ATTR_MPLS = 62, /* array of struct ovs_key_mpls.
- * The implementation may restrict
- * the accepted length of the array. */
__OVS_KEY_ATTR_MAX
};