X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbond.c;h=e15af04a3cf7519c12f9dcec7af27547aa2a7537;hb=98c50f96801d3159aad2de02407305463c68f51a;hp=ae914dd9ac4ba5476d438f598aed21a4f3259eff;hpb=18812dff32ce650440b9f1eac1bb00afe08c621a;p=openvswitch diff --git a/lib/bond.c b/lib/bond.c index ae914dd9..e15af04a 100644 --- a/lib/bond.c +++ b/lib/bond.c @@ -532,7 +532,7 @@ bond_send_learning_packet(struct bond *bond, 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); @@ -639,7 +639,6 @@ void 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; }