From 93bbe2a561fb6e64930dcaf320d12cfd30935187 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 10 Jun 2019 14:47:31 +0200 Subject: [PATCH] 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 (cherry picked from commit fa0f87fef735ad8359baa21f2553360bc88da530) (cherry picked from commit e94127432c6fc62db46535a39fc726b2343e840c) --- libnm-core/nm-setting-bond.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 51ce2debbc..f9916dfde6 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -511,6 +511,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)) },