compose_benign_packet(&packet, "Open vSwitch Bond Failover", 0xf177,
eth_src);
if (vlan) {
- eth_set_vlan_tci(&packet, htons(vlan));
+ eth_push_vlan(&packet, htons(vlan));
}
error = netdev_send(slave->netdev, &packet);
ofpbuf_uninit(&packet);
bond_account(struct bond *bond, const struct flow *flow, uint16_t vlan,
uint64_t n_bytes)
{
-
if (bond_is_balanced(bond)) {
lookup_bond_entry(bond, flow, vlan)->tx_bytes += n_bytes;
}
return;
}
} else {
- vlan = OFP_VLAN_NONE;
+ vlan = 0;
}
if (basis_s) {
void
bond_init(void)
{
- unixctl_command_register("bond/list", bond_unixctl_list, NULL);
- unixctl_command_register("bond/show", bond_unixctl_show, NULL);
- unixctl_command_register("bond/migrate", bond_unixctl_migrate, NULL);
- unixctl_command_register("bond/set-active-slave",
+ unixctl_command_register("bond/list", "", bond_unixctl_list, NULL);
+ unixctl_command_register("bond/show", "port", bond_unixctl_show, NULL);
+ unixctl_command_register("bond/migrate", "port hash slave",
+ bond_unixctl_migrate, NULL);
+ unixctl_command_register("bond/set-active-slave", "port slave",
bond_unixctl_set_active_slave, NULL);
- unixctl_command_register("bond/enable-slave", bond_unixctl_enable_slave,
- NULL);
- unixctl_command_register("bond/disable-slave", bond_unixctl_disable_slave,
- NULL);
- unixctl_command_register("bond/hash", bond_unixctl_hash, NULL);
+ unixctl_command_register("bond/enable-slave", "port slave",
+ bond_unixctl_enable_slave, NULL);
+ unixctl_command_register("bond/disable-slave", "port slave",
+ bond_unixctl_disable_slave, NULL);
+ unixctl_command_register("bond/hash", "mac [vlan] [basis]",
+ bond_unixctl_hash, NULL);
}
\f
static void
}
}
- if (!netdev_open_default(bond->name, &bond_dev)) {
+ if (!netdev_open(bond->name, "system", &bond_dev)) {
netdev_set_stats(bond_dev, &bond_stats);
netdev_close(bond_dev);
}