vport: Use EBUSY to represent already attached device.

We currently use EEXIST to represent both a device that is already
attached and for GRE devices that are the same as another one.
Instead use EBUSY for already attached devices to disambiguate the
two situations.

diff --git a/datapath/vport.c b/datapath/vport.c
index ef07a0910335270a2cbdd5be683fee67f663042d..5b865e16a4737b94589a0e2210216bfea951d913 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -208,7 +208,7 @@ do_vport_add(struct odp_vport_add *vport_config)
 
        vport = vport_locate(vport_config->devname);
        if (vport) {
-               err = -EEXIST;
+               err = -EBUSY;
                goto out;
        }
 

diff --git a/lib/netdev-gre.c b/lib/netdev-gre.c
index 45b574ffc3300b9173162efddc61623a4b78733b..25e0a646780da5a2c7cbcdd4f50664d811c17e1e 100644 (file)
--- a/lib/netdev-gre.c
+++ b/lib/netdev-gre.c
@@ -152,7 +152,7 @@ netdev_gre_create(const char *name, const char *type OVS_UNUSED,
     }
 
     err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    if (err == EEXIST) {
+    if (err == EBUSY) {
         VLOG_WARN("%s: destroying existing device", name);
 
         err = netdev_vport_do_ioctl(ODP_VPORT_DEL, ova.devname);

diff --git a/lib/netdev-patch.c b/lib/netdev-patch.c
index ec4d4bd8dc8d0804dc2c1ea09a259e91c8d09a4d..1340eb7194dfcbe7c8c919882a8552c7b470c163 100644 (file)
--- a/lib/netdev-patch.c
+++ b/lib/netdev-patch.c
@@ -103,7 +103,7 @@ netdev_patch_create(const char *name, const char *type OVS_UNUSED,
     ova.config = (char *)peer;
 
     err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    if (err == EEXIST) {
+    if (err == EBUSY) {
         VLOG_WARN("%s: destroying existing device", name);
 
         err = netdev_vport_do_ioctl(ODP_VPORT_DEL, ova.devname);