[ovs-dev,2/3] Revert "ofproto-dpif: Check for EBUSY as well"

Message ID 20181213142448.8504-3-fbl@redhat.com
State New
Headers show
Series
  • revert port duplicate checking optimization
Related show

Commit Message

Flavio Leitner Dec. 13, 2018, 2:24 p.m.
This reverts commit c65259a9b6e5380ac963944b69949ceb71ae623a.

The original commit 7521e0cf9e88 ("ofproto-dpif: Let the dpif report
when a port is a duplicate.") relies on the kernel to check if the
port exists or not. However, the current kernel code doesn't handle
when the port is moved to another network namespace.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
---
 ofproto/ofproto-dpif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 2dc5778e1..f40f157ca 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3665,7 +3665,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 && error != EBUSY) {
+    if (error != EEXIST) {
         if (error) {
             return error;
         }