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

2018-05-29 Thread Gregory Rose



On 5/25/2018 1:58 PM, Ben Pfaff wrote:

On Fri, May 25, 2018 at 06:28:49AM -0700, William Tu wrote:

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

Cc: Greg Rose 
Signed-off-by: William Tu 

Applied to master, thanks!

(Maybe I should have waited for Greg's feedback.)


Nope, it's fine.

Thanks,

- Greg


___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


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

2018-05-25 Thread Ben Pfaff
On Fri, May 25, 2018 at 06:28:49AM -0700, William Tu wrote:
> Clean up the duplicate definition of OVS_VPORT_TYPE_ERSPAN
> since it is defined in openvswitch.h.
> 
> Cc: Greg Rose 
> Signed-off-by: William Tu 

Applied to master, thanks!

(Maybe I should have waited for Greg's feedback.)
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


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

2018-05-25 Thread William Tu
Clean up the duplicate definition of OVS_VPORT_TYPE_ERSPAN
since it is defined in openvswitch.h.

Cc: Greg Rose 
Signed-off-by: William Tu 
---
 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

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev