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 874F5A057C for ; Fri, 27 Mar 2020 09:23:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 57EAB2BBE; Fri, 27 Mar 2020 09:23:07 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 331782BBE for ; Fri, 27 Mar 2020 09:23:05 +0100 (CET) IronPort-SDR: 6w0Ym75Gn1REeHxiOEIk7k4VPWUcJfsq4OH56Xvxq/xDebESCGPBtRg8Okhcp9FvT0OpCIfmt6 BmwDGr/dv4Gw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2020 01:23:04 -0700 IronPort-SDR: jXKU8XGjgMdS/JPMsR5FA86TuGooaV0qItNQGUgksun0nOow+diKGIn4gv6peLDL2bE83yIkFp /Rd3Bin6vpgA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,311,1580803200"; d="scan'208";a="447329689" Received: from npg-dpdk-zhangxiao.sh.intel.com ([10.67.110.203]) by fmsmga005.fm.intel.com with ESMTP; 27 Mar 2020 01:23:04 -0700 From: Xiao Zhang To: qabuild@intel.com Cc: Xiao Zhang , stable@dpdk.org Date: Fri, 27 Mar 2020 16:14:46 +0800 Message-Id: <20200327081446.5873-1-xiao.zhang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-stable] [DPDK] 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 Change-Id: Ic59582b58b51cb9c10b976ca744fe6a5f53ebc9e 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