From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6544BA0527 for ; Mon, 9 Nov 2020 19:42:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 523826883; Mon, 9 Nov 2020 19:42:50 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by dpdk.org (Postfix) with ESMTP id 3BEF16883 for ; Mon, 9 Nov 2020 19:42:49 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id s13so432724wmh.4 for ; Mon, 09 Nov 2020 10:42:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rw1l6qaabQA5IogeAoawyKW1Sx6KSGeJOSHcNyMoYHA=; b=hBrMyylONChlmWzdqsjGkwx0h9lPW1iWaJLk7unAmsfpL2niGaAgio504AFNkZGvgX Etsxy5G0MaslaFzE2TcokSWwodaBkM6XPP3zbshOu3Coc71T+ovnMDUj63njMOk7AlZf P11nobcwl5QD0ca/PZ8bWQznzjltSW+iC98eXSusstTEaRy4QyPqaflUY7+57NPy1CKl 4HCrVkKhc1IUhiX37KmsWJaRKlexbSqADb6Oujl+44St59F7IJsqZCnEy0xlg0X/29PA /09CxgehhyYleavIzD2sXrnKmAOrINXg8DsyrW1W9r46AWBpWM0DkUR9uVgXaxJ7gsw/ Sk6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rw1l6qaabQA5IogeAoawyKW1Sx6KSGeJOSHcNyMoYHA=; b=kI/1hWTDEaPv7RUoRjSMM2pemEL+sXN8TwJFeatPP8BAINw66VfhTw9G+IJiHbTO8V VFXY+bQLu3g20nFdHSYO7DjlpHq7TvWiurssiaUMtR2PLegRX6CuLXJU4cFX3N9xH7uk nsGIag1AJ8JvhPQez2d4nhDQpiU4RP6Bif+S/Z0U6MzvKMBvAXPG2jT34YYHAMAzGdef 5QJeq7F/qiLVtxqTGIJixbUQPIy9TlVjDtarfSr1wBf+l8k/6SG25VAQWtsMisU+CjCV o9XdRw6Ycq7gQjIPPgPZKEB/3DoL1GFc+otrkRsH3shX5bPgYWCNyUgj008j5vPTW5UF LQBA== X-Gm-Message-State: AOAM531Hd5etANLcCM4iVZJg3YUq5sEM4x32+z2HNL7wTGt1y+wScTM6 tIYpy5tes0Dz50jeir9hwU1b/m9FxvQfxw== X-Google-Smtp-Source: ABdhPJxH35nSRRpVgceAEQ/QN0ChcRJLeopjkutN4Qd2mkM1a74wQXHbSDfKYEjLlcl6Js6aqZS2Cw== X-Received: by 2002:a1c:df89:: with SMTP id w131mr523085wmg.164.1604947367960; Mon, 09 Nov 2020 10:42:47 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u5sm319956wml.13.2020.11.09.10.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:42:47 -0800 (PST) From: luca.boccassi@gmail.com To: "Min Hu (Connor)" Cc: Ferruh Yigit , dpdk stable Date: Mon, 9 Nov 2020 18:40:14 +0000 Message-Id: <20201109184111.3463090-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix bonding xmit balance policy command' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c78e321342ce7fe8f6493d72f136a253ad547462 Thanks. Luca Boccassi --- >From c78e321342ce7fe8f6493d72f136a253ad547462 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Tue, 20 Oct 2020 11:04:16 +0800 Subject: [PATCH] app/testpmd: fix bonding xmit balance policy command [ upstream commit 393e557ea8401d925655eb6c7c91fc7a450dcf2b ] Currently there exists inconsistency about name of transmission policy for a Link Bonding device. "xmit_balance_policy" is not correct, which should be modified to "balance_xmit_policy". Fixes: 2950a769315e ("bond: testpmd support") Fixes: ac718398f477 ("doc: testpmd application user guide") Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 2 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index f522b599b7..9287fa3ea4 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -614,7 +614,7 @@ static void cmd_help_long_parsed(void *parsed_result, "set bonding mode IEEE802.3AD aggregator policy (port_id) (agg_name)" " Set Aggregation mode for IEEE802.3AD (mode 4)" - "set bonding xmit_balance_policy (port_id) (l2|l23|l34)\n" + "set bonding balance_xmit_policy (port_id) (l2|l23|l34)\n" " Set the transmit balance policy for bonded device running in balance mode.\n\n" "set bonding mon_period (port_id) (value)\n" diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 78bdf60fe6..4dd29ee929 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -2437,16 +2437,16 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00: testpmd> set bonding mac 10 00:00:00:00:00:01 -set bonding xmit_balance_policy +set bonding balance_xmit_policy ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Set the transmission policy for a Link Bonding device when it is in Balance XOR mode:: - testpmd> set bonding xmit_balance_policy (port_id) (l2|l23|l34) + testpmd> set bonding balance_xmit_policy (port_id) (l2|l23|l34) For example, set a Link Bonding device (port 10) to use a balance policy of layer 3+4 (IP addresses & UDP ports):: - testpmd> set bonding xmit_balance_policy 10 l34 + testpmd> set bonding balance_xmit_policy 10 l34 set bonding mon_period -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:12.246481038 +0000 +++ 0026-app-testpmd-fix-bonding-xmit-balance-policy-command.patch 2020-11-09 18:40:11.127311220 +0000 @@ -1 +1 @@ -From 393e557ea8401d925655eb6c7c91fc7a450dcf2b Mon Sep 17 00:00:00 2001 +From c78e321342ce7fe8f6493d72f136a253ad547462 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 393e557ea8401d925655eb6c7c91fc7a450dcf2b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index d59c2b2c44..3f6d81c9a1 100644 +index f522b599b7..9287fa3ea4 100644 @@ -25 +26 @@ -@@ -649,7 +649,7 @@ static void cmd_help_long_parsed(void *parsed_result, +@@ -614,7 +614,7 @@ static void cmd_help_long_parsed(void *parsed_result, @@ -35 +36 @@ -index 86aaf8fe0c..82d377ceed 100644 +index 78bdf60fe6..4dd29ee929 100644 @@ -38 +39 @@ -@@ -2605,16 +2605,16 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00: +@@ -2437,16 +2437,16 @@ For example, to set the MAC address of a Link Bonding device (port 10) to 00:00: