X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=9b70e63cb1346e690753bf19936cacdace4c7f1e;hb=7b6b0ef47e398a2fbda48fd385f9781b2df8bebb;hp=6491590a9c3075fbf7b7475349f2c1dc0b2b038b;hpb=6c2d2a9f8318fea11250a7624144cb06436f91a4;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 6491590a..9b70e63c 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -859,7 +859,6 @@ bridge_add_ofproto_ports(struct bridge *br) options.name = iface->name; options.type = iface->type; options.args = &args; - options.ethertype = NETDEV_ETH_TYPE_NONE; error = netdev_open(&options, &iface->netdev); } else { error = netdev_set_config(iface->netdev, &args); @@ -871,12 +870,6 @@ bridge_add_ofproto_ports(struct bridge *br) iface->name, strerror(error)); } - /* Populate stats columns in new Interface rows. */ - if (iface->netdev && !iface->cfg->mtu) { - iface_refresh_stats(iface); - iface_refresh_status(iface); - } - /* Add the port, if necessary. */ if (iface->netdev && iface->ofp_port < 0) { uint16_t ofp_port; @@ -892,6 +885,12 @@ bridge_add_ofproto_ports(struct bridge *br) } } + /* Populate stats columns in new Interface rows. */ + if (iface->netdev && !iface->cfg->mtu) { + iface_refresh_stats(iface); + iface_refresh_status(iface); + } + /* Delete the iface if */ if (iface->netdev && iface->ofp_port >= 0) { VLOG_DBG("bridge %s: interface %s is on port %d", @@ -925,7 +924,6 @@ bridge_add_ofproto_ports(struct bridge *br) options.name = port->name; options.type = "internal"; options.args = NULL; - options.ethertype = NETDEV_ETH_TYPE_NONE; error = netdev_open(&options, &netdev); if (!error) { ofproto_port_add(br->ofproto, netdev, NULL);