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 98D8DA057C for ; Fri, 27 Mar 2020 09:27:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F9821C07E; Fri, 27 Mar 2020 09:27:50 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 3BD5B1BFD9; Fri, 27 Mar 2020 09:27:47 +0100 (CET) IronPort-SDR: M+AQRcPhN+7TYYUIEVptvcdLEkHx6v3I9HCHVhfVYMCTZG7I7+btxVAVbY/yua1UIWq31ER9mp 4LwTzXhLsvrg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2020 01:27:46 -0700 IronPort-SDR: BzlPKC4SQ+usxuZ+IzqmrcdIP9rXpeCd9bMVIcYsVTfsjGxlV8Ht6nuNZw3ytCXvE+kfgq1oI3 SiBFBhxJCwkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,311,1580803200"; d="scan'208";a="240906610" Received: from npg-dpdk-zhangxiao.sh.intel.com ([10.67.110.203]) by fmsmga008.fm.intel.com with ESMTP; 27 Mar 2020 01:27:43 -0700 From: Xiao Zhang To: dev@dpdk.org Cc: orika@mellanox.com, ying.a.wang@intel.com, qi.z.zhang@intel.com, wei.zhao1@intel.com, Xiao Zhang , stable@dpdk.org Date: Fri, 27 Mar 2020 16:19:26 +0800 Message-Id: <20200327081926.6154-1-xiao.zhang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-stable] app/testpmd: fix PPPOES flow API 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" The command line to create RTE flow for specific proto_id of PPPOES is not correct. This patch is to fix this issue. Fixes: 226c6e60c35b ("ethdev: add PPPoE to flow API") Cc: stable@dpdk.org Signed-off-by: Xiao Zhang --- app/test-pmd/cmdline_flow.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index a78154502..c25a2598d 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -768,7 +768,6 @@ static const enum index next_item[] = { ITEM_GTP_PSC, ITEM_PPPOES, ITEM_PPPOED, - ITEM_PPPOE_PROTO_ID, ITEM_HIGIG2, ITEM_TAG, ITEM_L2TPV3OIP, @@ -1030,11 +1029,6 @@ static const enum index item_pppoed[] = { static const enum index item_pppoes[] = { ITEM_PPPOE_SEID, - ITEM_NEXT, - ZERO, -}; - -static const enum index item_pppoe_proto_id[] = { ITEM_PPPOE_PROTO_ID, ITEM_NEXT, ZERO, @@ -2643,10 +2637,9 @@ static const struct token token_list[] = { [ITEM_PPPOE_PROTO_ID] = { .name = "proto_id", .help = "match PPPoE session protocol identifier", - .priv = PRIV_ITEM(PPPOE_PROTO_ID, - sizeof(struct rte_flow_item_pppoe_proto_id)), - .next = NEXT(item_pppoe_proto_id), - .call = parse_vc, + .next = NEXT(item_pppoes, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON + (struct rte_flow_item_pppoe_proto_id, proto_id)), }, [ITEM_HIGIG2] = { .name = "higig2", -- 2.17.1