summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/openvswitch.h
diff options
context:
space:
mode:
authorWilliam Tu2018-01-12 21:29:22 +0100
committerDavid S. Miller2018-01-15 20:33:16 +0100
commit95a332088ecb113c2e8753fa3f1df9b0dda9beec (patch)
tree6506e29c2c4408299d414a7b9cde7e830e4dd8f9 /include/uapi/linux/openvswitch.h
parentnet/tls: Fix inverted error codes to avoid endless loop (diff)
downloadkernel-qcow2-linux-95a332088ecb113c2e8753fa3f1df9b0dda9beec.tar.gz
kernel-qcow2-linux-95a332088ecb113c2e8753fa3f1df9b0dda9beec.tar.xz
kernel-qcow2-linux-95a332088ecb113c2e8753fa3f1df9b0dda9beec.zip
Revert "openvswitch: Add erspan tunnel support."
This reverts commit ceaa001a170e43608854d5290a48064f57b565ed. The OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS attr should be designed as a nested attribute to support all ERSPAN v1 and v2's fields. The current attr is a be32 supporting only one field. Thus, this patch reverts it and later patch will redo it using nested attr. Signed-off-by: William Tu <u9012063@gmail.com> Cc: Jiri Benc <jbenc@redhat.com> Cc: Pravin Shelar <pshelar@ovn.org> Acked-by: Jiri Benc <jbenc@redhat.com> Acked-by: Pravin B Shelar <pshelar@ovn.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/openvswitch.h')
-rw-r--r--include/uapi/linux/openvswitch.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 4265d7f9e1f2..dcfab5e3b55c 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -363,7 +363,6 @@ enum ovs_tunnel_key_attr {
OVS_TUNNEL_KEY_ATTR_IPV6_SRC, /* struct in6_addr src IPv6 address. */
OVS_TUNNEL_KEY_ATTR_IPV6_DST, /* struct in6_addr dst IPv6 address. */
OVS_TUNNEL_KEY_ATTR_PAD,
- OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* be32 ERSPAN index. */
__OVS_TUNNEL_KEY_ATTR_MAX
};