diff options
| author | Alex Wang <alexw@nicira.com> | 2013-07-22 18:15:49 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-09-05 13:10:33 -0700 |
| commit | 88dbaa9dc554d0ace1867bf23144788bd6f700bb (patch) | |
| tree | 1f73666da68227ffb415ae916e8c6ada02c2021f | |
| parent | 39ee7080f059ba331672447ed48c0937f04e3a0f (diff) | |
| download | openvswitch-88dbaa9dc554d0ace1867bf23144788bd6f700bb.tar.gz | |
vlan-splinter: Fix inverted logic bug.v1.10.2
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 <rsokolkov@gmail.com>
Signed-off-by: Alex Wang <alexw@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | vswitchd/bridge.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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); } |