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 1BE78A0A0C for ; Thu, 1 Jul 2021 04:53:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4205640040; Thu, 1 Jul 2021 04:53:02 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 72D4540040 for ; Thu, 1 Jul 2021 04:52:59 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10031"; a="188841597" X-IronPort-AV: E=Sophos;i="5.83,313,1616482800"; d="scan'208";a="188841597" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2021 19:52:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,313,1616482800"; d="scan'208";a="447710838" Received: from wuwenjun.sh.intel.com ([10.67.110.207]) by orsmga007.jf.intel.com with ESMTP; 30 Jun 2021 19:52:54 -0700 From: Wenjun Wu To: qi.z.zhang@intel.com, haiyue.wang@intel.com, yuying.zhang@intel.com Cc: stable@dpdk.org, Qiming Yang Date: Thu, 1 Jul 2021 10:33:24 +0800 Message-Id: <20210701023332.346457-16-wenjun1.wu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701023332.346457-1-wenjun1.wu@intel.com> References: <20210701023332.346457-1-wenjun1.wu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 20.11 15/23] net/ice/base: fix QinQ PPPoE dummy packet selection 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" From: Qi Zhang [ upstream commit 03697c24b7cafbd6c536204ba6470698fcf8c5e0 ] The dummy packet should be QinQ PPPoE ipv6 when ppp protocol is ipv6. Fixes: bb3386f348dd ("net/ice: enable QinQ filter for switch") Cc: stable@dpdk.org Signed-off-by: Yuying Zhang Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 9d8dc88844..d5576267b8 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -7403,6 +7403,11 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt, *pkt_len = sizeof(dummy_qinq_pppoe_ipv4_pkt); *offsets = dummy_qinq_pppoe_ipv4_packet_offsets; return; + } else if (tun_type == ICE_SW_TUN_PPPOE_QINQ && ipv6) { + *pkt = dummy_qinq_pppoe_ipv6_packet; + *pkt_len = sizeof(dummy_qinq_pppoe_ipv6_packet); + *offsets = dummy_qinq_pppoe_packet_offsets; + return; } else if (tun_type == ICE_SW_TUN_PPPOE_QINQ || tun_type == ICE_SW_TUN_PPPOE_PAY_QINQ) { *pkt = dummy_qinq_pppoe_ipv4_pkt; -- 2.25.1