datapath: Hash and compare only the part of sw_flow_key actually used.

[openvswitch] / lib / bond.c

diff --git a/lib/bond.c b/lib/bond.c
index 2b540523ef103efd9611ed234e4d1b174ff4ef05..cf1d057180f31b920832d7bcdbcb30a57649676d 100644 (file)
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -466,6 +466,10 @@ bond_run(struct bond *bond, struct tag_set *tags, bool lacp_negotiated)
         bond->miimon_next_update = time_msec() + bond->miimon_interval;
     }
 
+    if (bond->monitor) {
+        netdev_monitor_flush(bond->monitor);
+    }
+
     /* Enable slaves based on link status and LACP feedback. */
     HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) {
         bond_link_status_update(slave, tags);
@@ -1384,7 +1388,7 @@ static unsigned int
 bond_hash_tcp(const struct flow *flow, uint16_t vlan, uint32_t basis)
 {
     struct flow hash_flow = *flow;
-    hash_flow.vlan_tci = vlan;
+    hash_flow.vlan_tci = htons(vlan);
 
     /* The symmetric quality of this hash function is not required, but
      * flow_hash_symmetric_l4 already exists, and is sufficient for our