mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-13 14:07:02 +00:00
Code Issues Releases Wiki Activity

bridge: Get rid of 'n_ifaces' member of struct port.

Browse Source 
If it doesn't exist then it can't have the wrong value.
This commit is contained in:
Ben Pfaff
2011-03-24 10:29:36 -07:00
parent f620b43af1
commit 402f2858db
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vswitchd/bridge.c
View File

@@ -146,7 +146,6 @@ struct port {
/* An ordinary bridge port has 1 interface. /* An ordinary bridge port has 1 interface.
* A bridge port for bonding has at least 2 interfaces. */ * A bridge port for bonding has at least 2 interfaces. */
struct list ifaces; /* List of "struct iface"s. */ struct list ifaces; /* List of "struct iface"s. */
size_t n_ifaces; /* list_size(ifaces). */
/* Bonding info. */ /* Bonding info. */
struct bond *bond; struct bond *bond;
@@ -430,7 +429,7 @@ iterate_and_prune_ifaces(struct bridge *br,
} }
} }
if (!port->n_ifaces) { if (list_is_empty(&port->ifaces)) {
VLOG_WARN("%s port has no interfaces, dropping", port->name); VLOG_WARN("%s port has no interfaces, dropping", port->name);
port_destroy(port); port_destroy(port);
} }
@@ -1810,7 +1809,7 @@ bridge_reconfigure_one(struct bridge *br)
} }
port_reconfigure(port, node->data); port_reconfigure(port, node->data);
if (!port->n_ifaces) { if (list_is_empty(&port->ifaces)) {
VLOG_WARN("bridge %s: port %s has no interfaces, dropping", VLOG_WARN("bridge %s: port %s has no interfaces, dropping",
br->name, port->name); br->name, port->name);
port_destroy(port); port_destroy(port);
@@ -2025,7 +2024,7 @@ bridge_get_all_ifaces(const struct bridge *br, struct shash *ifaces)
LIST_FOR_EACH (iface, port_elem, &port->ifaces) { LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
shash_add_once(ifaces, iface->name, iface); shash_add_once(ifaces, iface->name, iface);
} }
if (port->n_ifaces > 1 && port->cfg->bond_fake_iface) { if (!list_is_short(&port->ifaces) && port->cfg->bond_fake_iface) {
shash_add_once(ifaces, port->name, NULL); shash_add_once(ifaces, port->name, NULL);
} }
} }
@@ -2431,7 +2430,7 @@ update_learning_table(struct bridge *br, const struct flow *flow, int vlan,
if (is_gratuitous_arp(flow)) { if (is_gratuitous_arp(flow)) {
/* We don't want to learn from gratuitous ARP packets that are /* We don't want to learn from gratuitous ARP packets that are
* reflected back over bond slaves so we lock the learning table. */ * reflected back over bond slaves so we lock the learning table. */
if (in_port->n_ifaces == 1) { if (!in_port->bond) {
mac_entry_set_grat_arp_lock(mac); mac_entry_set_grat_arp_lock(mac);
} else if (mac_entry_is_grat_arp_locked(mac)) { } else if (mac_entry_is_grat_arp_locked(mac)) {
return; return;
@@ -2852,7 +2851,7 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg)
/* Get VLAN tag. */ /* Get VLAN tag. */
vlan = -1; vlan = -1;
if (cfg->tag) { if (cfg->tag) {
if (port->n_ifaces < 2) { if (list_is_short(&port->ifaces)) {
vlan = *cfg->tag; vlan = *cfg->tag;
if (vlan >= 0 && vlan <= 4095) { if (vlan >= 0 && vlan <= 4095) {
VLOG_DBG("port %s: assigning VLAN tag %d", port->name, vlan); VLOG_DBG("port %s: assigning VLAN tag %d", port->name, vlan);
@@ -3003,7 +3002,7 @@ port_reconfigure_bond_lacp(struct port *port, struct lacp_settings *s)
if (s->priority <= 0 || s->priority > UINT16_MAX) { if (s->priority <= 0 || s->priority > UINT16_MAX) {
/* Prefer bondable links if unspecified. */ /* Prefer bondable links if unspecified. */
s->priority = UINT16_MAX - (port->n_ifaces > 1); s->priority = UINT16_MAX - !list_is_short(&port->ifaces);
} }
return s; return s;
} }
@@ -3031,7 +3030,7 @@ port_reconfigure_bond(struct port *port)
const char *detect_s; const char *detect_s;
struct iface *iface; struct iface *iface;
if (port->n_ifaces < 2) { if (list_is_short(&port->ifaces)) {
/* Not a bonded port. */ /* Not a bonded port. */
bond_destroy(port->bond); bond_destroy(port->bond);
port->bond = NULL; port->bond = NULL;
@@ -3135,7 +3134,6 @@ iface_create(struct port *port, const struct ovsrec_interface *if_cfg)
shash_add_assert(&br->iface_by_name, iface->name, iface); shash_add_assert(&br->iface_by_name, iface->name, iface);
list_push_back(&port->ifaces, &iface->port_elem); list_push_back(&port->ifaces, &iface->port_elem);
port->n_ifaces++;
VLOG_DBG("attached network device %s to port %s", iface->name, port->name); VLOG_DBG("attached network device %s to port %s", iface->name, port->name);
@@ -3162,7 +3160,6 @@ iface_destroy(struct iface *iface)
} }
list_remove(&iface->port_elem); list_remove(&iface->port_elem);
port->n_ifaces--;
netdev_close(iface->netdev); netdev_close(iface->netdev);