diff options
| author | Ethan Jackson <ethan@nicira.com> | 2012-05-21 13:20:18 -0700 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2012-05-21 23:48:51 -0700 |
| commit | 0e4b96b57c212c2799e6e5f0ba1b19ff1f3a37d3 (patch) | |
| tree | 42a10c50b729bce107c8e7358a879fc17fade0fb | |
| parent | 0e985ba4b946e47db86f146ef19a255bb867750d (diff) | |
bridge: Ignore "null" interfaces as required.
Commit bae7208e91a0 (bridge: Refactor bridge_reconfigure().)
introduced a regression in which the switch would attempt to
instantiate "null" interfaces in the datapath. This would, of
course, fail and trigger a warning. Though harmless, these
warnings confused users.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
| -rw-r--r-- | vswitchd/bridge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 13eb80bd..0c78f946 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2545,11 +2545,12 @@ bridge_add_del_ports(struct bridge *br, for (i = 0; i < port->n_interfaces; i++) { const struct ovsrec_interface *cfg = port->interfaces[i]; struct iface *iface = iface_lookup(br, cfg->name); + const char *type = iface_get_type(cfg, br->cfg); if (iface) { iface->cfg = cfg; - iface->type = iface_get_type(cfg, br->cfg); - } else { + iface->type = type; + } else if (strcmp(type, "null")) { bridge_queue_if_cfg(br, cfg, port); } } |