From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A5E8A0C4C for ; Mon, 12 Jul 2021 15:12:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 502D74119D; Mon, 12 Jul 2021 15:12:22 +0200 (CEST) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id F2BE44069D for ; Mon, 12 Jul 2021 15:12:20 +0200 (CEST) Received: by mail-wr1-f48.google.com with SMTP id l7so24632619wrv.7 for ; Mon, 12 Jul 2021 06:12:20 -0700 (PDT) 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=1dr90IKkw/s5Wqee50/pkUpEvLlyA61Q0xbCnO64uYo=; b=eqjExzCpqc8+2gdWcDbrJd+bzVVUjQiKSxOABpiug/VIwVJfJAgzvy8PFui2tRs6WL yvDRD8sH0mHYwnciVgAd4NL8Ex2jCOK4s7K+ia+ohpXGHXR/jb0q2kW7RxFsPjqlxASP SrtTWywRWXLyN+ke+Ubm2MzexeXCZdzOeYriUE6CUpIh2BfDvytO3pWTIEk4DWFbwS43 7Vvi4HMjgTwzrffT1//VaunjCJRLut0Y22CPyWN/EZSaGjjU15m9WbNMy67OooZStoSH 2SLLbgouCggcaJWgc54SS/Yr0avjBKoWGfZAzUpzXi7qKLpwIiETP9druAMqzNsEOdm/ M24Q== 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=1dr90IKkw/s5Wqee50/pkUpEvLlyA61Q0xbCnO64uYo=; b=pRBbGRFILpIMatF/nxs9B9DZ1eXx+CEP2lpDDY6uQnWtNKNfXZXSnNKXWJ4AMzBjFq n9huSIltKbq1ck6on2I4xsk8qOEC+duwOmsYD2zU2q5IhtFQ+QNqvzaehv9gKpH9UoCX 9WY0yKV6Xh+qD2x+QM7Ehl1ny3mAWwfFHsb33FahN1dKev1FYrOdQJWNIxNDR5PAy+4g ALnlLNtogNfiUzSodkt6AKoXowLqpPRCQKQfwooBIcJiserQZMYiaie7ccc2H6Kx77VE r53xlK2DGr40TIwdb2AjGVF+tiVW8JcryncyK/9598tNqd86uo5RyshUiB5jVcZhmvZR FIPA== X-Gm-Message-State: AOAM533xK1xrL3S4BvaaBieqR31TgDFrMYs9D3Jgqhp0vUJ5P3BfENVz le4AfNUhs4IqA3ZMuo+Wpus= X-Google-Smtp-Source: ABdhPJz3d5AY9KRjxTjsS0ycgF4tZCCd/GnZe/K4H2vPpQ81PVpya2MYFXo0AUyeDN6uMh1bS8UIwA== X-Received: by 2002:a5d:6986:: with SMTP id g6mr57260889wru.321.1626095540741; Mon, 12 Jul 2021 06:12:20 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id h15sm14236882wrq.88.2021.07.12.06.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:12:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Chenglian Sun Cc: David Marchand , dpdk stable Date: Mon, 12 Jul 2021 14:04:38 +0100 Message-Id: <20210712130551.2462159-43-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/l2fwd: fix [no-]mac-updating options' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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/a3519aa2e1d177af30d5f1ddddaa39082bec2fe3 Thanks. Luca Boccassi --- >From a3519aa2e1d177af30d5f1ddddaa39082bec2fe3 Mon Sep 17 00:00:00 2001 From: Chenglian Sun Date: Tue, 22 Jun 2021 10:47:05 +0800 Subject: [PATCH] examples/l2fwd: fix [no-]mac-updating options [ upstream commit bbbe38a6d59ccdda25917712701e629d0b10af6f ] For l2fwd, --no-mac-updating and --mac-updating are treated as invalid arguments. Rework long options parsing to let --no-mac-updating and --mac-updating options work well. Fixes: fa19eb20d212 ("examples/l2fwd: add forwarding port mapping option") Signed-off-by: Chenglian Sun Reviewed-by: David Marchand --- examples/l2fwd/main.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index ffb67bb901..23e5e46761 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -434,13 +434,16 @@ enum { /* first long only option value must be >= 256, so that we won't * conflict with short options */ - CMD_LINE_OPT_MIN_NUM = 256, + CMD_LINE_OPT_MAC_UPDATING_NUM = 256, + CMD_LINE_OPT_NO_MAC_UPDATING_NUM, CMD_LINE_OPT_PORTMAP_NUM, }; static const struct option lgopts[] = { - { CMD_LINE_OPT_MAC_UPDATING, no_argument, &mac_updating, 1}, - { CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, &mac_updating, 0}, + { CMD_LINE_OPT_MAC_UPDATING, no_argument, 0, + CMD_LINE_OPT_MAC_UPDATING_NUM}, + { CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, 0, + CMD_LINE_OPT_NO_MAC_UPDATING_NUM}, { CMD_LINE_OPT_PORTMAP_CONFIG, 1, 0, CMD_LINE_OPT_PORTMAP_NUM}, {NULL, 0, 0, 0} }; @@ -502,6 +505,14 @@ l2fwd_parse_args(int argc, char **argv) } break; + case CMD_LINE_OPT_MAC_UPDATING_NUM: + mac_updating = 1; + break; + + case CMD_LINE_OPT_NO_MAC_UPDATING_NUM: + mac_updating = 0; + break; + default: l2fwd_usage(prgname); return -1; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:38.885958775 +0100 +++ 0043-examples-l2fwd-fix-no-mac-updating-options.patch 2021-07-12 13:41:36.334119361 +0100 @@ -1 +1 @@ -From bbbe38a6d59ccdda25917712701e629d0b10af6f Mon Sep 17 00:00:00 2001 +From a3519aa2e1d177af30d5f1ddddaa39082bec2fe3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bbbe38a6d59ccdda25917712701e629d0b10af6f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 32d405e65a..ca4db6014b 100644 +index ffb67bb901..23e5e46761 100644 @@ -23 +24 @@ -@@ -433,13 +433,16 @@ enum { +@@ -434,13 +434,16 @@ enum { @@ -43 +44 @@ -@@ -501,6 +504,14 @@ l2fwd_parse_args(int argc, char **argv) +@@ -502,6 +505,14 @@ l2fwd_parse_args(int argc, char **argv)