bonding: disable arp and enable mii monitoring when bond change to no uses arp mode
Because the ARP monitoring is not support for 802.3ad, but I still could change the mode to 802.3ad from ab mode while ARP monitoring is running, it is incorrect. So add a check for 802.3ad in bonding_store_mode to fix the problem, and make a new macro BOND_NO_USES_ARP() to simplify the code. v2: according to the Dan Williams's suggestion, bond mode is the most important bond option, it should override any of the other sub-options. So when the mode is changed, the conficting values should be cleared or reset, otherwise the user has to duplicate more operations to modify the logic. I disable the arp and enable mii monitoring when the bond mode is changed to AB, TB and 8023AD if the arp interval is true. v3: according to the Nik's suggestion, the default value of miimon should need a name, there is several place to use it, and the bond_store_arp_interval() could use micro BOND_NO_USES_ARP to make the code more simpify. Suggested-by: Dan Williams <dcbw@redhat.com> Suggested-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Reviewed-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

gecommit door
David S. Miller

bovenliggende
31e20bad8d
commit
fe9d04afe9
@@ -4110,7 +4110,7 @@ static int bond_check_params(struct bond_params *params)
|
||||
if (!miimon) {
|
||||
pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure, speed and duplex which are essential for 802.3ad operation\n");
|
||||
pr_warning("Forcing miimon to 100msec\n");
|
||||
miimon = 100;
|
||||
miimon = BOND_DEFAULT_MIIMON;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4147,7 +4147,7 @@ static int bond_check_params(struct bond_params *params)
|
||||
if (!miimon) {
|
||||
pr_warning("Warning: miimon must be specified, otherwise bonding will not detect link failure and link speed which are essential for TLB/ALB load balancing\n");
|
||||
pr_warning("Forcing miimon to 100msec\n");
|
||||
miimon = 100;
|
||||
miimon = BOND_DEFAULT_MIIMON;
|
||||
}
|
||||
}
|
||||
|
||||
|
Verwijs in nieuw issue
Block a user