[ovs-dev] [PATCH 2/2] compati/ip_gre: remove duplicate vport definition.

William Tu u9012063 at gmail.com
Fri May 25 13:28:49 UTC 2018


Clean up the duplicate definition of OVS_VPORT_TYPE_ERSPAN
since it is defined in openvswitch.h.

Cc: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: William Tu <u9012063 at gmail.com>
---
 datapath/linux/compat/ip_gre.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c
index 4e5565ee362a..5911c6cc10a2 100644
--- a/datapath/linux/compat/ip_gre.c
+++ b/datapath/linux/compat/ip_gre.c
@@ -1568,10 +1568,6 @@ static struct vport *erspan_create(const struct vport_parms *parms)
 	return ovs_netdev_link(vport, parms->name);
 }
 
-#ifndef OVS_VPORT_TYPE_ERSPAN
-/* Until integration is done... */
-#define OVS_VPORT_TYPE_ERSPAN  107  /* ERSPAN tunnel. */
-#endif
 static struct vport_ops ovs_erspan_vport_ops = {
 	.type		= OVS_VPORT_TYPE_ERSPAN,
 	.create		= erspan_create,
-- 
2.7.4



More information about the dev mailing list