summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2013-03-04 13:00:25 -0800
committerPravin B Shelar <pshelar@nicira.com>2013-03-04 13:00:25 -0800
commit85c9de194b9f432f7b8a66bda980cbab52a55b72 (patch)
tree25164e6f238a1be19a104e66d00ca05a4601d35e /include/linux
parent0d0673857b5b2a50f6aef62e0f042795d9893690 (diff)
downloadopenvswitch-85c9de194b9f432f7b8a66bda980cbab52a55b72.tar.gz
Tunnel: Cleanup old tunnel infrastructure.
Since userspace flow based tunneling code is checked in, the kernel port based tunneling code can be removed. Patch removes following components: - tunnel ports hash table and moved tunnel ports list to individual vports. - Cleaned per tnl-port config. - OVS_KEY_ATTR_TUN_ID action is removed. Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Acked-by: Jesse Gross <jesse@nicira.com> Bug #15078
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/openvswitch.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index 63d1cacbd..3556fddeb 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -243,6 +243,16 @@ enum {
#define OVS_PATCH_ATTR_MAX (__OVS_PATCH_ATTR_MAX - 1)
+/* OVS_VPORT_ATTR_OPTIONS attributes for tunnels.
+ */
+enum {
+ OVS_TUNNEL_ATTR_UNSPEC,
+ OVS_TUNNEL_ATTR_DST_PORT, /* 16-bit UDP port, used by L4 tunnels. */
+ __OVS_TUNNEL_ATTR_MAX
+};
+
+#define OVS_TUNNEL_ATTR_MAX (__OVS_TUNNEL_ATTR_MAX - 1)
+
/* Flows. */
#define OVS_FLOW_FAMILY "ovs_flow"
@@ -286,7 +296,6 @@ enum ovs_key_attr {
#endif
OVS_KEY_ATTR_MPLS = 62, /* struct ovs_key_mpls */
- OVS_KEY_ATTR_TUN_ID = 63, /* be64 tunnel ID */
__OVS_KEY_ATTR_MAX
};