From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 25DAD239 for ; Mon, 15 Oct 2018 13:52:32 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id r63-v6so18588704wma.4 for ; Mon, 15 Oct 2018 04:52:32 -0700 (PDT) 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=cecgXbkbjiX5HaTlDJ8pDWWJMY3rvkOStMtpx8yNNME=; b=dI8FNlY95U9wvo6S3aDOOQxMyG+cmAfXPebJ2zEt+ziKGRmj+/Ahf40oOfxR5mrMCR EIih3p6aen/5WQx8xQOMIB4MebFWpV0JF/q9hyXW4a/kO+rAxaIlJRgvnXpuXqizEUum f+C2u6fACG6aG6yBdEJTE489ob39p+yIVjGoDwnM/qyxekkW/68l5mOldkwd+pNTczic 0Uq2xfYehZzkYkete+6U+pUyFJW13ji9f/Jmm9r5NK2mtIfZa1YSUhPMEC8iHDrXwKC1 DJQ8RGvw1yEtkmyC+txLXW/ejCY728+r4x3iLHQRd7sRVzyzIXwlnM8fC1wuNB+9Q/MP b4WA== X-Gm-Message-State: ABuFfohh2jeVLz0VFgyOEHM2ZZ3Bb2HK9YQCi2Z5OvEsejTCmFBge/xP pvFxgMswsjh+TzuFAD0LE2I= X-Google-Smtp-Source: ACcGV60RZI5XHJk0u2qYrVPSV+EKX+bn0c76BHmbYzH9KDQJOgU9giGAeqgRhPS+XtegRw7kGncIhw== X-Received: by 2002:a1c:a345:: with SMTP id m66-v6mr13520458wme.104.1539604351724; Mon, 15 Oct 2018 04:52:31 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id a84-v6sm6027914wmf.46.2018.10.15.04.52.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:52:30 -0700 (PDT) From: Luca Boccassi To: Brian Archbold Cc: Bernard Iremonger , dpdk stable Date: Mon, 15 Oct 2018 12:51:42 +0100 Message-Id: <20181015115144.27626-22-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix duplicate exit' has been queued to LTS release 16.11.9 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: , X-List-Received-Date: Mon, 15 Oct 2018 11:52:32 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/17/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From 895cdcac16fd85ed71e3df18d571729bf19b3e58 Mon Sep 17 00:00:00 2001 From: Brian Archbold Date: Wed, 22 Aug 2018 07:05:06 +0100 Subject: [PATCH] app/testpmd: fix duplicate exit [ upstream commit 27c7031e0b49abbaf13ea4c4a809a07b9282422d ] In interactive mode, when the "quit" command is issued, pmd_test_exit() is being called twice, once through the "quit" command and the other after termination of prompt. Remove duplicated exit routine by removing call from "quit" command. Steps to reproduce: - Run testpmd in interactive mode. - type "quit". Fixes: af75078fece3 ("first public release") Signed-off-by: Brian Archbold Acked-by: Bernard Iremonger --- app/test-pmd/cmdline.c | 1 - 1 file changed, 1 deletion(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 4c63eb5de6..7590d1bde8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -6221,7 +6221,6 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result, struct cmdline *cl, __attribute__((unused)) void *data) { - pmd_test_exit(); cmdline_quit(cl); } -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-15 12:48:35.170617512 +0100 +++ 0022-app-testpmd-fix-duplicate-exit.patch 2018-10-15 12:48:34.613096016 +0100 @@ -1,8 +1,10 @@ -From 27c7031e0b49abbaf13ea4c4a809a07b9282422d Mon Sep 17 00:00:00 2001 +From 895cdcac16fd85ed71e3df18d571729bf19b3e58 Mon Sep 17 00:00:00 2001 From: Brian Archbold Date: Wed, 22 Aug 2018 07:05:06 +0100 Subject: [PATCH] app/testpmd: fix duplicate exit +[ upstream commit 27c7031e0b49abbaf13ea4c4a809a07b9282422d ] + In interactive mode, when the "quit" command is issued, pmd_test_exit() is being called twice, once through the "quit" command and the other after termination of prompt. @@ -14,7 +16,6 @@ - type "quit". Fixes: af75078fece3 ("first public release") -Cc: stable@dpdk.org Signed-off-by: Brian Archbold Acked-by: Bernard Iremonger @@ -23,10 +24,10 @@ 1 file changed, 1 deletion(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c -index 1b40e3fa89..dd5616d354 100644 +index 4c63eb5de6..7590d1bde8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c -@@ -7670,7 +7670,6 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result, +@@ -6221,7 +6221,6 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result, struct cmdline *cl, __attribute__((unused)) void *data) {