vlan-splinter: Fix inverted logic bug.

When "other-config:enable-vlan-splinters=true" is set, the existing vlans with ip address must be retained. The bug actually does the opposite and retains the vlans without ip address. This commit fixes it. Reported-by: Roman Sokolkov <[email protected]> Signed-off-by: Alex Wang <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
subashd · Sep 5, 2013 · 88dbaa9 · 88dbaa9
1 parent 39ee708
commit 88dbaa9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -181,6 +181,7 @@ Ramana Reddy            [email protected]
 Rob Sherwood            [email protected]
 Roger Leigh             [email protected]
 Rogério Vinhal Nunes
+Roman Sokolkov          [email protected]
 Saul St. John           [email protected]
 Scott Hendricks         [email protected]
 Sean Brady              [email protected]

diff --git 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);
                 }