From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C96901B505 for ; Fri, 30 Nov 2018 00:14:20 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:20:12 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW82032075; Fri, 30 Nov 2018 01:14:17 +0200 From: Yongseok Koh To: Brian Archbold Cc: Bernard Iremonger , dpdk stable Date: Thu, 29 Nov 2018 15:10:56 -0800 Message-Id: <20181129231202.30436-62-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'app/testpmd: fix duplicate exit' has been queued to LTS release 17.11.5 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: Thu, 29 Nov 2018 23:14:21 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From f6535133e3e31fe14c4e540bc78e0ba477202865 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 209e64e22..cad33579b 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -7052,7 +7052,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.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:47.964090388 -0800 +++ 0062-app-testpmd-fix-duplicate-exit.patch 2018-11-29 15:01:45.162958000 -0800 @@ -1,8 +1,10 @@ -From 27c7031e0b49abbaf13ea4c4a809a07b9282422d Mon Sep 17 00:00:00 2001 +From f6535133e3e31fe14c4e540bc78e0ba477202865 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 1b40e3fa8..dd5616d35 100644 +index 209e64e22..cad33579b 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, +@@ -7052,7 +7052,6 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result, struct cmdline *cl, __attribute__((unused)) void *data) {