From: Greg Rose <gvrose8192@gmail.com>
Date: Fri, 24 Aug 2018 20:36:29 +0000 (-0700)
Subject: ofproto-dpif: Check for EBUSY as well
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2ea84e98e457384cbb3257133a4e652b8e5b1cf2;p=ovs.git

ofproto-dpif: Check for EBUSY as well

Guru reported that we can't create more than one geneve tunnel.
Sometimes a driver will return EBUSY as well as EEXIST for some
duplicate configurations.  Check for EBUSY too.

Fixes: 7521e0cf9e ("ofproto-dpif: Let the dpif report when a ...")
Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-August/047214.html
Reported-by: Guru Shetty <guru@ovn.org>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index e3abda571..0a0c69a7a 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3687,7 +3687,7 @@ port_add(struct ofproto *ofproto_, struct netdev *netdev)
 
     odp_port_t port_no = ODPP_NONE;
     int error = dpif_port_add(ofproto->backer->dpif, netdev, &port_no);
-    if (error != EEXIST) {
+    if (error != EEXIST && error != EBUSY) {
         if (error) {
             return error;
         }