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 39FDAA0350 for ; Mon, 21 Feb 2022 16:42:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35E8C4013F; Mon, 21 Feb 2022 16:42:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DB5B24013F for ; Mon, 21 Feb 2022 16:42:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uSipPqzfMFT5lE3JeIDYNBjD9ZOxTyvOE5DyXhHruiE=; b=cFnSPwSYxvKJ/Xipbx4kXvD79MJX060QdzRr68mbex5/3Sc2cmWFp9Z+HW/8OhEUyQg7+Y 6yVh5aXSQLVrGS5Alc0KoyldZaKTE3vLOsw6h17My4wdbRZNILESK1un4zIMiHjTeGrqgQ H7vyY8662X5hIou3AyNWVU5Yfj7kjUY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-5hbW1RrbOgKZsXenC8v9mg-1; Mon, 21 Feb 2022 10:42:21 -0500 X-MC-Unique: 5hbW1RrbOgKZsXenC8v9mg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 176E0100C661; Mon, 21 Feb 2022 15:42:20 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id D09AA7E2E8; Mon, 21 Feb 2022 15:42:18 +0000 (UTC) From: Kevin Traynor To: Jie Wang Cc: Ori Kam , Ferruh Yigit , dpdk stable Subject: patch 'net: fix L2TPv2 common header' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:50 +0000 Message-Id: <20220221153625.152324-161-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/851b597291901044f72d4150887ab1449dc59e8a Thanks. Kevin --- >From 851b597291901044f72d4150887ab1449dc59e8a Mon Sep 17 00:00:00 2001 From: Jie Wang Date: Wed, 9 Feb 2022 17:38:53 +0800 Subject: [PATCH] net: fix L2TPv2 common header [ upstream commit 9747f6955b01005bb19e8dfacd64c4bb92dbd07e ] The fields of L2TPv2 common header were reversed in big endian and little endian. This patch fixes this error to ensure L2TPv2 can be parsed correctly. For L2TP reference: https://datatracker.ietf.org/doc/html/rfc2661#section-3.1 Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol") Signed-off-by: Jie Wang Acked-by: Ori Kam Acked-by: Ferruh Yigit --- lib/net/rte_l2tpv2.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/net/rte_l2tpv2.h b/lib/net/rte_l2tpv2.h index 938a993b48..1f3ad3f03c 100644 --- a/lib/net/rte_l2tpv2.h +++ b/lib/net/rte_l2tpv2.h @@ -90,23 +90,23 @@ struct rte_l2tpv2_common_hdr { struct { #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN - uint16_t t:1; /**< message Type */ - uint16_t l:1; /**< length option bit */ - uint16_t res1:2; /**< reserved */ - uint16_t s:1; /**< ns/nr option bit */ - uint16_t res2:1; /**< reserved */ - uint16_t o:1; /**< offset option bit */ - uint16_t p:1; /**< priority option bit */ - uint16_t res3:4; /**< reserved */ uint16_t ver:4; /**< protocol version */ + uint16_t res3:4; /**< reserved */ + uint16_t p:1; /**< priority option bit */ + uint16_t o:1; /**< offset option bit */ + uint16_t res2:1; /**< reserved */ + uint16_t s:1; /**< ns/nr option bit */ + uint16_t res1:2; /**< reserved */ + uint16_t l:1; /**< length option bit */ + uint16_t t:1; /**< message Type */ #elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN - uint16_t ver:4; /**< protocol version */ - uint16_t res3:4; /**< reserved */ - uint16_t p:1; /**< priority option bit */ - uint16_t o:1; /**< offset option bit */ - uint16_t res2:1; /**< reserved */ - uint16_t s:1; /**< ns/nr option bit */ - uint16_t res1:2; /**< reserved */ - uint16_t l:1; /**< length option bit */ uint16_t t:1; /**< message Type */ + uint16_t l:1; /**< length option bit */ + uint16_t res1:2; /**< reserved */ + uint16_t s:1; /**< ns/nr option bit */ + uint16_t res2:1; /**< reserved */ + uint16_t o:1; /**< offset option bit */ + uint16_t p:1; /**< priority option bit */ + uint16_t res3:4; /**< reserved */ + uint16_t ver:4; /**< protocol version */ #endif }; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.038467585 +0000 +++ 0161-net-fix-L2TPv2-common-header.patch 2022-02-21 15:22:44.310704619 +0000 @@ -1 +1 @@ -From 9747f6955b01005bb19e8dfacd64c4bb92dbd07e Mon Sep 17 00:00:00 2001 +From 851b597291901044f72d4150887ab1449dc59e8a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9747f6955b01005bb19e8dfacd64c4bb92dbd07e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org