projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use int type for setsockopt IP_TOS value
[openvswitch]
/
lib
/
bond.c
diff --git
a/lib/bond.c
b/lib/bond.c
index cffdae249f63b45f04f43e9ba0127cd8b2cf9506..4d711c0346521bb2df33cdddd59ace18e6cb9c4b 100644
(file)
--- a/
lib/bond.c
+++ b/
lib/bond.c
@@
-488,7
+488,7
@@
static bool
may_send_learning_packets(const struct bond *bond)
{
return bond->lacp_status == LACP_DISABLED
may_send_learning_packets(const struct bond *bond)
{
return bond->lacp_status == LACP_DISABLED
- && bond->balance != BM_
AB
+ && bond->balance != BM_
STABLE
&& bond->active_slave;
}
&& bond->active_slave;
}
@@
-531,8
+531,7
@@
bond_compose_learning_packet(struct bond *bond,
slave = choose_output_slave(bond, &flow, vlan);
packet = ofpbuf_new(0);
slave = choose_output_slave(bond, &flow, vlan);
packet = ofpbuf_new(0);
- compose_benign_packet(packet, "Open vSwitch Bond Failover", 0xf177,
- eth_src);
+ compose_rarp(packet, eth_src);
if (vlan) {
eth_push_vlan(packet, htons(vlan));
}
if (vlan) {
eth_push_vlan(packet, htons(vlan));
}