summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2019-06-10 14:47:31 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2019-06-11 18:30:18 +0200
commitfa0f87fef735ad8359baa21f2553360bc88da530 (patch)
tree934ac171759327158473f9ca154ad1c13376a9d8
parent6a3bb90ad4f6e4876faa46fb02bca0c7801fb30b (diff)
downloadNetworkManager-fa0f87fef735ad8359baa21f2553360bc88da530.tar.gz
libnm-core: change unsupported modes for arp_ip_targets bond option
If the mode is one of '802.3ad', 'tlb' or 'alb' and the connection has both 'arp_interval' and 'arp_ip_target' options, during normalization we remove 'arp_interval' because unsupported in the current mode. The connection then becomes invalid because 'arp_ip_target' requires 'arp_interval'. Since 'arp_interval' and 'arp_ip_target' are mutually dependent, the latter should also be unsupported for those bonding modes. https://bugzilla.redhat.com/show_bug.cgi?id=1718173
-rw-r--r--libnm-core/nm-setting-bond.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index 872e112784..87e9c8517f 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -509,6 +509,7 @@ static const struct {
{ NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE, ~(BIT (NM_BOND_MODE_ROUNDROBIN)) },
{ NM_SETTING_BOND_OPTION_ARP_VALIDATE, BIT (NM_BOND_MODE_8023AD) | BIT (NM_BOND_MODE_TLB) | BIT (NM_BOND_MODE_ALB) },
{ NM_SETTING_BOND_OPTION_ARP_INTERVAL, BIT (NM_BOND_MODE_8023AD) | BIT (NM_BOND_MODE_TLB) | BIT (NM_BOND_MODE_ALB) },
+ { NM_SETTING_BOND_OPTION_ARP_IP_TARGET, BIT (NM_BOND_MODE_8023AD) | BIT (NM_BOND_MODE_TLB) | BIT (NM_BOND_MODE_ALB) },
{ NM_SETTING_BOND_OPTION_LACP_RATE, ~(BIT (NM_BOND_MODE_8023AD)) },
{ NM_SETTING_BOND_OPTION_PRIMARY, ~(BIT (NM_BOND_MODE_ACTIVEBACKUP) | BIT (NM_BOND_MODE_TLB) | BIT (NM_BOND_MODE_ALB)) },
{ NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, ~(BIT (NM_BOND_MODE_ACTIVEBACKUP) | BIT (NM_BOND_MODE_TLB) | BIT (NM_BOND_MODE_ALB)) },