summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--vswitchd/bridge.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 0cb1ac642..ce96e5dcd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -181,6 +181,7 @@ Ramana Reddy gtvrreddy@gmail.com
Rob Sherwood rob.sherwood@bigswitch.com
Roger Leigh rleigh@codelibre.net
Rogério Vinhal Nunes
+Roman Sokolkov rsokolkov@gmail.com
Saul St. John sstjohn@cs.wisc.edu
Scott Hendricks shendricks@nicira.com
Sean Brady sbrady@gtfservices.com
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 724b4b937..186bdd072 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3974,10 +3974,10 @@ collect_splinter_vlans(const struct ovsrec_open_vswitch *ovs_cfg)
if (!netdev_open(vlan_dev->name, "system", &netdev)) {
if (!netdev_get_in4(netdev, NULL, NULL) ||
!netdev_get_in6(netdev, NULL)) {
- vlandev_del(vlan_dev->name);
- } else {
/* It has an IP address configured, so we don't own
* it. Don't delete it. */
+ } else {
+ vlandev_del(vlan_dev->name);
}
netdev_close(netdev);
}