From ba9dbfa4e5aaef9aa646a7718f302433ecf1a001 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Tue, 25 May 2021 08:45:46 -0400 Subject: [PATCH] bond: support `tlb_dynamic_lb` in `balance-alb` mode In kernel, `tlb_dynamic_lb` is supported to configure in bonding mode `balance-alb`. Therefore, add the support in NetworkManager to avoid undesirable limitation. Kernel previously had such limitation and it was removed in https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e79c1055749e3183a2beee04a24da378623329c5. Signed-off-by: Wen Liang https://bugzilla.redhat.com/show_bug.cgi?id=1959934 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/868 (cherry picked from commit 18839361aca42d5c9f470268c28063a6e7578851) (cherry picked from commit 2f42c781edebac329c8031561c4b210118c0b3ab) --- libnm-core/nm-setting-bond.c | 2 +- libnm-core/tests/test-setting.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 68d4ca88f6..ea82d838c7 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -225,7 +225,7 @@ static NM_UTILS_STRING_TABLE_LOOKUP_DEFINE( {NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE, ~(BIT(NM_BOND_MODE_ROUNDROBIN))}, {NM_SETTING_BOND_OPTION_PRIMARY, ~(BIT(NM_BOND_MODE_ACTIVEBACKUP) | BIT(NM_BOND_MODE_TLB) | BIT(NM_BOND_MODE_ALB))}, - {NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB, ~(BIT(NM_BOND_MODE_TLB))}, ); + {NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB, ~(BIT(NM_BOND_MODE_TLB) | BIT(NM_BOND_MODE_ALB))}, ); gboolean _nm_setting_bond_option_supported(const char *option, NMBondMode mode) diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c index 01cdb41cb2..56ba31541a 100644 --- a/libnm-core/tests/test-setting.c +++ b/libnm-core/tests/test-setting.c @@ -687,7 +687,7 @@ test_bond_normalize(void) ((const char *[]){"mode", "active-backup", "miimon", "1", NULL})); test_bond_normalize_options( ((const char *[]){"mode", "balance-alb", "tlb_dynamic_lb", "1", NULL}), - ((const char *[]){"mode", "balance-alb", NULL})); + ((const char *[]){"mode", "balance-alb", "tlb_dynamic_lb", "1", NULL})); test_bond_normalize_options( ((const char *[]){"mode", "balance-tlb", "tlb_dynamic_lb", "1", NULL}), ((const char *[]){"mode", "balance-tlb", "tlb_dynamic_lb", "1", NULL})); -- 2.26.3