GET

Patch Detail

get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/115084/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 115084,
    "url": "http://patches.dpdk.org/api/patches/115084/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220815073206.2917968-57-qi.z.zhang@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20220815073206.2917968-57-qi.z.zhang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20220815073206.2917968-57-qi.z.zhang@intel.com",
    "date": "2022-08-15T07:31:52",
    "name": "[v2,56/70] net/ice/base: enable FDIR support for L2TPv2",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "3be4900936710592f5bef36c26138c9ccad17a9e",
    "submitter": {
        "id": 504,
        "url": "http://patches.dpdk.org/api/people/504/?format=api",
        "name": "Qi Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "delegate": {
        "id": 1540,
        "url": "http://patches.dpdk.org/api/users/1540/?format=api",
        "username": "qzhan15",
        "first_name": "Qi",
        "last_name": "Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220815073206.2917968-57-qi.z.zhang@intel.com/mbox/",
    "series": [
        {
            "id": 24308,
            "url": "http://patches.dpdk.org/api/series/24308/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24308",
            "date": "2022-08-15T07:30:56",
            "name": "ice base code update",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/24308/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/115084/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/115084/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5E86BA00C3;\n\tMon, 15 Aug 2022 01:27:11 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 693EE42B98;\n\tMon, 15 Aug 2022 01:23:50 +0200 (CEST)",
            "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by mails.dpdk.org (Postfix) with ESMTP id 8283542CFD\n for <dev@dpdk.org>; Mon, 15 Aug 2022 01:23:48 +0200 (CEST)",
            "from orsmga008.jf.intel.com ([10.7.209.65])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 14 Aug 2022 16:23:48 -0700",
            "from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.4])\n by orsmga008.jf.intel.com with ESMTP; 14 Aug 2022 16:23:46 -0700"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1660519428; x=1692055428;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=NYvpdyw2QnvDclu6kNtiXxz+OeqpO50qFTEGfdPJqJw=;\n b=gMxEnP45HkwOyRr5EyC16/5WQIx/4WEXwkx1b2bbYd9wUmUrtSRcZR0e\n JR+quYeaTqieKdmeNc3wypcmAHFx0LpviL/aoswy9aae/H+dZlXMqQdG/\n JXwD4eLAqj/qua8AeiNBKeWkIJehyxZw5hPJNpadcEMA4dNg8+2Ppn18i\n jHxqzMje/HwJo9JMxzQzPpNOyHsZY0P10W0FPU0Qe7R8m8aFAO7NR2FyH\n mKrt1Y/FKCx1Uf0fMK6+zzNupz+N3IDO+58OMPNExH1WVmhqXehKuvwdm\n bnntCmFS4oOKj1kAWKuUWbjdB+/6QH9e6M9cMQBit1i9+Fbeq+B7o6pZO w==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6400,9594,10439\"; a=\"274914508\"",
            "E=Sophos;i=\"5.93,237,1654585200\"; d=\"scan'208\";a=\"274914508\"",
            "E=Sophos;i=\"5.93,237,1654585200\"; d=\"scan'208\";a=\"635283299\""
        ],
        "X-ExtLoop1": "1",
        "From": "Qi Zhang <qi.z.zhang@intel.com>",
        "To": "qiming.yang@intel.com",
        "Cc": "dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,\n Jie Wang <jie1x.wang@intel.com>",
        "Subject": "[PATCH v2 56/70] net/ice/base: enable FDIR support for L2TPv2",
        "Date": "Mon, 15 Aug 2022 03:31:52 -0400",
        "Message-Id": "<20220815073206.2917968-57-qi.z.zhang@intel.com>",
        "X-Mailer": "git-send-email 2.31.1",
        "In-Reply-To": "<20220815073206.2917968-1-qi.z.zhang@intel.com>",
        "References": "<20220815071306.2910599-1-qi.z.zhang@intel.com>\n <20220815073206.2917968-1-qi.z.zhang@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org"
    },
    "content": "Add L2TPv2(include PPP over L2TPv2) support for FDIR.\n\nAnd add support PPPoL2TPv2oUDP with inner IPV4/IPV6/UDP/TCP for\nFDIR.\n\nThe supported L2TPv2 packets are defined as below:\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_CONTROL\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_UDP\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_TCP\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_UDP\nICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_TCP\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_CONTROL\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_UDP\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_TCP\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_UDP\nICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_TCP\n\nSigned-off-by: Jie Wang <jie1x.wang@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/ice/base/ice_fdir.c | 711 +++++++++++++++++++++++++++++++-\n drivers/net/ice/base/ice_fdir.h |  19 +\n drivers/net/ice/base/ice_type.h |  27 ++\n 3 files changed, 755 insertions(+), 2 deletions(-)",
    "diff": "diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c\nindex 6bbab0c843..a554379075 100644\n--- a/drivers/net/ice/base/ice_fdir.c\n+++ b/drivers/net/ice/base/ice_fdir.c\n@@ -1827,6 +1827,289 @@ static const u8 ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00,\n };\n \n+/* IPV4 L2TPV2 control */\n+static const u8 ice_fdir_ipv4_l2tpv2_ctrl_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0xc2, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x14,\n+\t0x2c, 0x6b, 0xc8, 0x02, 0x00, 0x0c, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+/* IPV4 L2TPV2 */\n+static const u8 ice_fdir_ipv4_l2tpv2_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0xc2, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x14,\n+\t0x2c, 0x6b, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 */\n+static const u8 ice_fdir_ipv4_l2tpv2_ppp_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x26, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0xc4, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x12,\n+\t0xf5, 0x77, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 IPV4 */\n+static const u8 ice_fdir_ipv4_l2tpv2_ppp4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x3a, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0xb0, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x26,\n+\t0xf5, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x21, 0x45, 0x00, 0x00, 0x14,\n+\t0x00, 0x01, 0x00, 0x00, 0x40, 0x00, 0x7c, 0xe7,\n+\t0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00, 0x00, 0x01,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 IPV4 UDP */\n+static const u8 ice_fdir_udp4_l2tpv2_ppp4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x42, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0xa8, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x2e,\n+\t0xf3, 0x3a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x21, 0x45, 0x00, 0x00, 0x1c,\n+\t0x00, 0x01, 0x00, 0x00, 0x40, 0x11, 0x7c, 0xce,\n+\t0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00, 0x00, 0x01,\n+\t0x00, 0x35, 0x00, 0x35, 0x00, 0x08, 0x01, 0x72,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 IPV4 TCP */\n+static const u8 ice_fdir_tcp4_l2tpv2_ppp4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x4e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0x9c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x3a,\n+\t0xf3, 0x23, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x21, 0x45, 0x00, 0x00, 0x28,\n+\t0x00, 0x01, 0x00, 0x00, 0x40, 0x06, 0x7c, 0xcd,\n+\t0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00, 0x00, 0x01,\n+\t0x00, 0x14, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x50, 0x02, 0x20, 0x00,\n+\t0x91, 0x7c, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 IPV6 */\n+static const u8 ice_fdir_ipv6_l2tpv2_ppp4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x4e, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0x9c, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x3a,\n+\t0x59, 0x8e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x57, 0x60, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x3b, 0x40, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 IPV6 UDP */\n+static const u8 ice_fdir_udp6_l2tpv2_ppp4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x56, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0x94, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x42,\n+\t0x83, 0x91, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x57, 0x60, 0x00, 0x00, 0x00,\n+\t0x00, 0x08, 0x11, 0x40, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x01, 0x00, 0x35, 0x00, 0x35,\n+\t0x00, 0x08, 0xff, 0x72, 0x00, 0x00,\n+};\n+\n+/* IPV4 PPPOL2TPV2 IPV6 TCP */\n+static const u8 ice_fdir_tcp6_l2tpv2_ppp4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,\n+\t0x7c, 0x88, 0x7f, 0x00, 0x00, 0x01, 0x7f, 0x00,\n+\t0x00, 0x01, 0x06, 0xa5, 0x06, 0xa5, 0x00, 0x4e,\n+\t0x8e, 0x6e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,\n+\t0xff, 0x03, 0x00, 0x57, 0x60, 0x00, 0x00, 0x00,\n+\t0x00, 0x14, 0x06, 0x40, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x01, 0x00, 0x14, 0x00, 0x50,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x50, 0x02, 0x20, 0x00, 0x8f, 0x7d, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV6 L2TPV2 control */\n+static const u8 ice_fdir_ipv6_l2tpv2_ctrl_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x14, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x14, 0x2a, 0x6c, 0xc8, 0x02,\n+\t0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+};\n+\n+/* IPV6 L2TPV2 */\n+static const u8 ice_fdir_ipv6_l2tpv2_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x14, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x14, 0x2a, 0x6c, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 */\n+static const u8 ice_fdir_ipv6_l2tpv2_ppp_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x12, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x12, 0xf3, 0x78, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 IPV4 */\n+static const u8 ice_fdir_ipv4_l2tpv2_ppp6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x26, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x26, 0xf3, 0x2f, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x21,\n+\t0x45, 0x00, 0x00, 0x14, 0x00, 0x01, 0x00, 0x00,\n+\t0x40, 0x00, 0x7c, 0xe7, 0x7f, 0x00, 0x00, 0x01,\n+\t0x7f, 0x00, 0x00, 0x01, 0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 IPV4 UDP */\n+static const u8 ice_fdir_udp4_l2tpv2_ppp6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x2e, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x2e, 0xf1, 0x3b, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x21,\n+\t0x45, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x00, 0x00,\n+\t0x40, 0x11, 0x7c, 0xce, 0x7f, 0x00, 0x00, 0x01,\n+\t0x7f, 0x00, 0x00, 0x01, 0x00, 0x35, 0x00, 0x35,\n+\t0x00, 0x08, 0x01, 0x72, 0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 IPV4 TCP */\n+static const u8 ice_fdir_tcp4_l2tpv2_ppp6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x3a, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x3a, 0xf1, 0x24, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x21,\n+\t0x45, 0x00, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00,\n+\t0x40, 0x06, 0x7c, 0xcd, 0x7f, 0x00, 0x00, 0x01,\n+\t0x7f, 0x00, 0x00, 0x01, 0x00, 0x14, 0x00, 0x50,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x50, 0x02, 0x20, 0x00, 0x91, 0x7c, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 IPV6 */\n+static const u8 ice_fdir_ipv6_l2tpv2_ppp6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x3a, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x3a, 0x57, 0x8f, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x57,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x40,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 IPV6 UDP */\n+static const u8 ice_fdir_udp6_l2tpv2_ppp6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x42, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x42, 0x81, 0x92, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x57,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x11, 0x40,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\n+\t0x00, 0x35, 0x00, 0x35, 0x00, 0x08, 0xff, 0x72,\n+\t0x00, 0x00,\n+};\n+\n+/* IPV6 PPPOL2TPV2 IPV6 TCP */\n+static const u8 ice_fdir_tcp6_l2tpv2_ppp6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x4e, 0x11, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0xa5,\n+\t0x06, 0xa5, 0x00, 0x4e, 0x8c, 0x6f, 0x00, 0x02,\n+\t0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x57,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x14, 0x06, 0x40,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\n+\t0x00, 0x14, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x50, 0x02, 0x20, 0x00,\n+\t0x8f, 0x7d, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n static const u8 ice_fdir_tcpv6_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,\n@@ -2912,6 +3195,142 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {\n \t\tsizeof(ice_fdir_tcp6_gtpu4_eh_up_gre6_pkt),\n \t\tice_fdir_tcp6_gtpu4_eh_up_gre6_pkt,\n \t},\n+\t/* IPV4 L2TPV2 CONTROL */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_CONTROL,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ctrl_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ctrl_pkt,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ctrl_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ctrl_pkt,\n+\t},\n+\t/* IPV4 L2TPV2 */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_pkt,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_pkt,\n+\t},\n+\t/* IPV4 L2TPV2 PPP */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ppp_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ppp_pkt,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ppp_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ppp_pkt,\n+\t},\n+\t/* IPV4 L2TPV2 PPP IPV4 */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ppp4_pkt,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ppp4_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_UDP,\n+\t\tsizeof(ice_fdir_udp4_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_udp4_l2tpv2_ppp4_pkt,\n+\t\tsizeof(ice_fdir_udp4_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_udp4_l2tpv2_ppp4_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_TCP,\n+\t\tsizeof(ice_fdir_tcp4_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_tcp4_l2tpv2_ppp4_pkt,\n+\t\tsizeof(ice_fdir_tcp4_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_tcp4_l2tpv2_ppp4_pkt,\n+\t},\n+\t/* IPV4 L2TPV2 PPP IPV6 */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ppp4_pkt,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ppp4_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_UDP,\n+\t\tsizeof(ice_fdir_udp6_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_udp6_l2tpv2_ppp4_pkt,\n+\t\tsizeof(ice_fdir_udp6_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_udp6_l2tpv2_ppp4_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_TCP,\n+\t\tsizeof(ice_fdir_tcp6_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_tcp6_l2tpv2_ppp4_pkt,\n+\t\tsizeof(ice_fdir_tcp6_l2tpv2_ppp4_pkt),\n+\t\tice_fdir_tcp6_l2tpv2_ppp4_pkt,\n+\t},\n+\t/* IPV6 L2TPV2 CONTROL */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_CONTROL,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ctrl_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ctrl_pkt,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ctrl_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ctrl_pkt,\n+\t},\n+\t/* IPV6 L2TPV2 */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_pkt,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_pkt,\n+\t},\n+\t/* IPV6 L2TPV2 PPP */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ppp_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ppp_pkt,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ppp_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ppp_pkt,\n+\t},\n+\t/* IPV6 L2TPV2 PPP IPV4 */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ppp6_pkt,\n+\t\tsizeof(ice_fdir_ipv4_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_ipv4_l2tpv2_ppp6_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_UDP,\n+\t\tsizeof(ice_fdir_udp4_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_udp4_l2tpv2_ppp6_pkt,\n+\t\tsizeof(ice_fdir_udp4_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_udp4_l2tpv2_ppp6_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_TCP,\n+\t\tsizeof(ice_fdir_tcp4_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_tcp4_l2tpv2_ppp6_pkt,\n+\t\tsizeof(ice_fdir_tcp4_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_tcp4_l2tpv2_ppp6_pkt,\n+\t},\n+\t/* IPV6 L2TPV2 PPP IPV6 */\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ppp6_pkt,\n+\t\tsizeof(ice_fdir_ipv6_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_ipv6_l2tpv2_ppp6_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_UDP,\n+\t\tsizeof(ice_fdir_udp6_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_udp6_l2tpv2_ppp6_pkt,\n+\t\tsizeof(ice_fdir_udp6_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_udp6_l2tpv2_ppp6_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_TCP,\n+\t\tsizeof(ice_fdir_tcp6_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_tcp6_l2tpv2_ppp6_pkt,\n+\t\tsizeof(ice_fdir_tcp6_l2tpv2_ppp6_pkt),\n+\t\tice_fdir_tcp6_l2tpv2_ppp6_pkt,\n+\t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_IPV6_TCP,\n \t\tsizeof(ice_fdir_tcpv6_pkt), ice_fdir_tcpv6_pkt,\n@@ -3290,6 +3709,111 @@ ice_fdir_get_open_tunnel_port(struct ice_hw *hw, enum ice_fltr_ptype flow,\n \treturn ICE_SUCCESS;\n }\n \n+/**\n+ * ice_fdir_gen_l2tpv2_pkt - generate L2TPv2 training packet\n+ * @pkt: pointer to return filter packet\n+ * @l2tpv2_data: pointer to ice_fdir_l2tpv2 data structure\n+ * @idx: the matched packet index of FDIR training packet table\n+ * @offset: position of end byte for PPPoL2TPv2 packet\n+ * @tun: true implies generate a tunnel packet\n+ */\n+static u16\n+ice_fdir_gen_l2tpv2_pkt(u8 *pkt, struct ice_fdir_l2tpv2 *l2tpv2_data,\n+\t\t\tu16 idx, u16 offset, bool tun)\n+{\n+\tu16 flags_version;\n+\tu16 offset_size;\n+\tu16 pos;\n+\n+\t/* get outer packet end pos, 10 = l2tpv2 default len 6 + ppp len 4 */\n+\tpos = offset - ICE_L2TPV2_PKT_LENGTH - ICE_PPP_PKT_LENGTH;\n+\n+\t/* copy outer packet */\n+\tice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt, pos, ICE_NONDMA_TO_NONDMA);\n+\n+\t/* copy l2tpv2 packet common header */\n+\tice_memcpy(pkt + pos, &l2tpv2_data->flags_version,\n+\t\t   sizeof(l2tpv2_data->flags_version),\n+\t\t   ICE_NONDMA_TO_NONDMA);\n+\tpos += sizeof(l2tpv2_data->flags_version);\n+\n+\tflags_version = BE16_TO_CPU(l2tpv2_data->flags_version);\n+\tif (flags_version == 0) {\n+\t\tl2tpv2_data->flags_version = CPU_TO_BE16(ICE_L2TPV2_FLAGS_VER);\n+\t\tflags_version = ICE_L2TPV2_FLAGS_VER;\n+\t}\n+\n+\t/* copy l2tpv2 length */\n+\tif (flags_version & ICE_L2TPV2_FLAGS_LEN) {\n+\t\tice_memcpy(pkt + pos, &l2tpv2_data->length,\n+\t\t\t   sizeof(l2tpv2_data->length),\n+\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\tpos += sizeof(l2tpv2_data->length);\n+\t}\n+\n+\t/* copy l2tpv2 tunnel id */\n+\tice_memcpy(pkt + pos, &l2tpv2_data->tunnel_id,\n+\t\t   sizeof(l2tpv2_data->tunnel_id),\n+\t\t   ICE_NONDMA_TO_NONDMA);\n+\tpos += sizeof(l2tpv2_data->tunnel_id);\n+\n+\t/* copy l2tpv2 session id */\n+\tice_memcpy(pkt + pos, &l2tpv2_data->session_id,\n+\t\t   sizeof(l2tpv2_data->session_id),\n+\t\t   ICE_NONDMA_TO_NONDMA);\n+\tpos += sizeof(l2tpv2_data->session_id);\n+\n+\t/* copy l2tpv2 ns + nr */\n+\tif (flags_version & ICE_L2TPV2_FLAGS_SEQ) {\n+\t\tice_memcpy(pkt + pos, &l2tpv2_data->ns,\n+\t\t\t   sizeof(l2tpv2_data->ns),\n+\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\tpos += sizeof(l2tpv2_data->ns);\n+\n+\t\tice_memcpy(pkt + pos, &l2tpv2_data->nr,\n+\t\t\t   sizeof(l2tpv2_data->nr),\n+\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\tpos += sizeof(l2tpv2_data->nr);\n+\t}\n+\n+\t/* copy l2tpv2 offset size + offset padding */\n+\tif (flags_version & ICE_L2TPV2_FLAGS_OFF) {\n+\t\tice_memcpy(pkt + pos, &l2tpv2_data->offset_size,\n+\t\t\t   sizeof(l2tpv2_data->offset_size),\n+\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\tpos += sizeof(l2tpv2_data->offset_size);\n+\t\t/* insert 0 into offset padding */\n+\t\toffset_size = BE16_TO_CPU(l2tpv2_data->offset_size);\n+\t\tif (offset_size > ICE_FDIR_MAX_RAW_PKT_SIZE -\n+\t\t    ice_fdir_pkt[idx].tun_pkt_len) {\n+\t\t\toffset_size = ICE_FDIR_MAX_RAW_PKT_SIZE -\n+\t\t\t\t\tice_fdir_pkt[idx].tun_pkt_len;\n+\t\t}\n+\t\tice_memset(pkt + pos, 0, offset_size, ICE_NONDMA_MEM);\n+\t\tpos += offset_size;\n+\t}\n+\n+\tif (ice_fdir_pkt[idx].tun_pkt_len > offset) {\n+\t\t/* copy ppp packet */\n+\t\tice_memcpy(pkt + pos,\n+\t\t\t   ice_fdir_pkt[idx].tun_pkt + offset -\n+\t\t\t\tICE_PPP_PKT_LENGTH,\n+\t\t\t   ICE_PPP_PKT_LENGTH,\n+\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\tpos += ICE_PPP_PKT_LENGTH;\n+\n+\t\t/* copy inner packets */\n+\t\tif (tun) {\n+\t\t\tice_memcpy(pkt + pos,\n+\t\t\t\t   ice_fdir_pkt[idx].tun_pkt + offset,\n+\t\t\t\t   ice_fdir_pkt[idx].tun_pkt_len - offset,\n+\t\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\t}\n+\t}\n+\n+\treturn pos;\n+}\n+\n /**\n  * ice_fdir_get_gen_prgm_pkt - generate a training packet\n  * @hw: pointer to the hardware structure\n@@ -3306,6 +3830,9 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \tu16 tnl_port;\n \tu8 *loc;\n \tu16 idx;\n+\tu16 flags_version;\n+\tu16 pos;\n+\tu16 offset;\n \n \tif (input->flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER) {\n \t\tswitch (input->ip.v4.proto) {\n@@ -3346,9 +3873,29 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\t\tbreak;\n \tif (idx == ICE_FDIR_NUM_PKT)\n \t\treturn ICE_ERR_PARAM;\n+\n \tif (!tun) {\n-\t\tice_memcpy(pkt, ice_fdir_pkt[idx].pkt,\n-\t\t\t   ice_fdir_pkt[idx].pkt_len, ICE_NONDMA_TO_NONDMA);\n+\t\tswitch (flow) {\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_CONTROL:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP:\n+\t\t\toffset = ICE_FDIR_IPV4_L2TPV2_PPP_PKT_OFF;\n+\t\t\tice_fdir_gen_l2tpv2_pkt(pkt, &input->l2tpv2_data,\n+\t\t\t\t\t\tidx, offset, tun);\n+\t\t\tbreak;\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_CONTROL:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP:\n+\t\t\toffset = ICE_FDIR_IPV6_L2TPV2_PPP_PKT_OFF;\n+\t\t\tice_fdir_gen_l2tpv2_pkt(pkt, &input->l2tpv2_data,\n+\t\t\t\t\t\tidx, offset, tun);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tice_memcpy(pkt, ice_fdir_pkt[idx].pkt,\n+\t\t\t\t   ice_fdir_pkt[idx].pkt_len,\n+\t\t\t\t   ICE_NONDMA_TO_NONDMA);\n+\t\t\tbreak;\n+\t\t}\n \t\tloc = pkt;\n \t} else {\n \t\tif (!ice_fdir_pkt[idx].tun_pkt)\n@@ -3479,6 +4026,28 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\t\t\t   ICE_NONDMA_TO_NONDMA);\n \t\t\tloc = &pkt[ICE_FDIR_V6_V4_GTPOGRE_EH_PKT_OFF];\n \t\t\tbreak;\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_UDP:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_TCP:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_UDP:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_TCP:\n+\t\t\toffset = ICE_FDIR_IPV4_L2TPV2_PPP_PKT_OFF;\n+\t\t\tpos = ice_fdir_gen_l2tpv2_pkt(pkt, &input->l2tpv2_data,\n+\t\t\t\t\t\t      idx, offset, tun);\n+\t\t\tloc = &pkt[pos];\n+\t\t\tbreak;\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_UDP:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_TCP:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_UDP:\n+\t\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_TCP:\n+\t\t\toffset = ICE_FDIR_IPV6_L2TPV2_PPP_PKT_OFF;\n+\t\t\tpos = ice_fdir_gen_l2tpv2_pkt(pkt, &input->l2tpv2_data,\n+\t\t\t\t\t\t      idx, offset, tun);\n+\t\t\tloc = &pkt[pos];\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tif (ice_fdir_get_open_tunnel_port(hw, flow, &tnl_port))\n \t\t\t\treturn ICE_ERR_DOES_NOT_EXIST;\n@@ -4021,6 +4590,138 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\tice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET,\n \t\t\t\t     input->ip.v6.tc);\n \t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_CONTROL:\n+\t\tice_pkt_insert_mac_addr(loc, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_L2TPV2_LEN_SESS_ID_OFFSET,\n+\t\t\t\t   input->l2tpv2_data.session_id);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP:\n+\t\tice_pkt_insert_mac_addr(loc, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tflags_version = BE16_TO_CPU(input->l2tpv2_data.flags_version);\n+\t\tif (flags_version & ICE_L2TPV2_FLAGS_LEN) {\n+\t\t\tice_pkt_insert_u16(loc,\n+\t\t\t\t\t   ICE_IPV4_L2TPV2_LEN_SESS_ID_OFFSET,\n+\t\t\t\t\t   input->l2tpv2_data.session_id);\n+\t\t} else {\n+\t\t\tice_pkt_insert_u16(loc,\n+\t\t\t\t\t   ICE_IPV4_L2TPV2_SESS_ID_OFFSET,\n+\t\t\t\t\t   input->l2tpv2_data.session_id);\n+\t\t}\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_CONTROL:\n+\t\tice_pkt_insert_mac_addr(loc, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_L2TPV2_LEN_SESS_ID_OFFSET,\n+\t\t\t\t   input->l2tpv2_data.session_id);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP:\n+\t\tice_pkt_insert_mac_addr(loc, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tflags_version = BE16_TO_CPU(input->l2tpv2_data.flags_version);\n+\t\tif (flags_version & ICE_L2TPV2_FLAGS_LEN) {\n+\t\t\tice_pkt_insert_u16(loc,\n+\t\t\t\t\t   ICE_IPV6_L2TPV2_LEN_SESS_ID_OFFSET,\n+\t\t\t\t\t   input->l2tpv2_data.session_id);\n+\t\t} else {\n+\t\t\tice_pkt_insert_u16(loc,\n+\t\t\t\t\t   ICE_IPV6_L2TPV2_SESS_ID_OFFSET,\n+\t\t\t\t\t   input->l2tpv2_data.session_id);\n+\t\t}\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4:\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_DST_ADDR_OFFSET,\n+\t\t\t\t   input->ip.v4.src_ip);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_SRC_ADDR_OFFSET,\n+\t\t\t\t   input->ip.v4.dst_ip);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET,\n+\t\t\t\t  input->ip.v4.tos);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET,\n+\t\t\t\t  input->ip.v4.ttl);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_PROTO_OFFSET,\n+\t\t\t\t  input->ip.v4.proto);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_UDP:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_UDP:\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_DST_ADDR_OFFSET,\n+\t\t\t\t   input->ip.v4.src_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_UDP4_NO_MAC_DST_PORT_OFFSET,\n+\t\t\t\t   input->ip.v4.src_port);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_SRC_ADDR_OFFSET,\n+\t\t\t\t   input->ip.v4.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_UDP4_NO_MAC_SRC_PORT_OFFSET,\n+\t\t\t\t   input->ip.v4.dst_port);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET,\n+\t\t\t\t  input->ip.v4.tos);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET,\n+\t\t\t\t  input->ip.v4.ttl);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_TCP:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_TCP:\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_DST_ADDR_OFFSET,\n+\t\t\t\t   input->ip.v4.src_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_TCP4_NO_MAC_DST_PORT_OFFSET,\n+\t\t\t\t   input->ip.v4.src_port);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_NO_MAC_SRC_ADDR_OFFSET,\n+\t\t\t\t   input->ip.v4.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_TCP4_NO_MAC_SRC_PORT_OFFSET,\n+\t\t\t\t   input->ip.v4.dst_port);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET,\n+\t\t\t\t  input->ip.v4.tos);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET,\n+\t\t\t\t  input->ip.v4.ttl);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET,\n+\t\t\t\t     input->ip.v6.tc);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET,\n+\t\t\t\t  input->ip.v6.hlim);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_PROTO_OFFSET,\n+\t\t\t\t  input->ip.v6.proto);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_UDP:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_UDP:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_UDP6_NO_MAC_DST_PORT_OFFSET,\n+\t\t\t\t   input->ip.v6.src_port);\n+\t\tice_pkt_insert_u16(loc, ICE_UDP6_NO_MAC_SRC_PORT_OFFSET,\n+\t\t\t\t   input->ip.v6.dst_port);\n+\t\tice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET,\n+\t\t\t\t     input->ip.v6.tc);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET,\n+\t\t\t\t  input->ip.v6.hlim);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_TCP:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_TCP:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_TCP6_NO_MAC_DST_PORT_OFFSET,\n+\t\t\t\t   input->ip.v6.src_port);\n+\t\tice_pkt_insert_u16(loc, ICE_TCP6_NO_MAC_SRC_PORT_OFFSET,\n+\t\t\t\t   input->ip.v6.dst_port);\n+\t\tice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET,\n+\t\t\t\t     input->ip.v6.tc);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET,\n+\t\t\t\t  input->ip.v6.hlim);\n+\t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_TCP:\n \t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.src_ip);\n@@ -4252,6 +4953,12 @@ ice_fdir_comp_rules_extended(struct ice_fdir_fltr *a,  struct ice_fdir_fltr *b)\n \t\treturn false;\n \tif (memcmp(&a->ecpri_mask, &b->ecpri_mask, sizeof(a->ecpri_mask)))\n \t\treturn false;\n+\tif (memcmp(&a->l2tpv2_data.session_id, &b->l2tpv2_data.session_id,\n+\t\t   sizeof(a->l2tpv2_data.session_id)))\n+\t\treturn false;\n+\tif (memcmp(&a->l2tpv2_mask.session_id, &b->l2tpv2_mask.session_id,\n+\t\t   sizeof(a->l2tpv2_mask.session_id)))\n+\t\treturn false;\n \n \treturn true;\n }\ndiff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h\nindex d57b1daecd..ced880fff1 100644\n--- a/drivers/net/ice/base/ice_fdir.h\n+++ b/drivers/net/ice/base/ice_fdir.h\n@@ -26,6 +26,8 @@\n #define ICE_FDIR_V4_V6_GTPOGRE_EH_PKT_OFF\t102\n #define ICE_FDIR_V6_V4_GTPOGRE_EH_PKT_OFF\t102\n #define ICE_FDIR_V6_V6_GTPOGRE_EH_PKT_OFF\t122\n+#define ICE_FDIR_IPV4_L2TPV2_PPP_PKT_OFF\t52\n+#define ICE_FDIR_IPV6_L2TPV2_PPP_PKT_OFF\t72\n \n #define ICE_FDIR_TUN_PKT_OFF\t\t50\n #define ICE_FDIR_MAX_RAW_PKT_SIZE\t(512 + ICE_FDIR_TUN_PKT_OFF)\n@@ -96,6 +98,10 @@\n #define ICE_IPV4_VXLAN_VNI_OFFSET\t46\n #define ICE_ECPRI_TP0_PC_ID_OFFSET\t18\n #define ICE_IPV4_UDP_ECPRI_TP0_PC_ID_OFFSET\t\t\t46\n+#define ICE_IPV4_L2TPV2_SESS_ID_OFFSET\t\t46\n+#define ICE_IPV6_L2TPV2_SESS_ID_OFFSET\t\t66\n+#define ICE_IPV4_L2TPV2_LEN_SESS_ID_OFFSET\t48\n+#define ICE_IPV6_L2TPV2_LEN_SESS_ID_OFFSET\t68\n \n #define ICE_FDIR_MAX_FLTRS\t\t16384\n \n@@ -222,6 +228,16 @@ struct ice_fdir_ecpri {\n \t__be16 pc_id;\n };\n \n+struct ice_fdir_l2tpv2 {\n+\t__be16 flags_version;\n+\t__be16 length;\n+\t__be16 tunnel_id;\n+\t__be16 session_id;\n+\t__be16 ns;\n+\t__be16 nr;\n+\t__be16 offset_size;\n+};\n+\n struct ice_fdir_extra {\n \tu8 dst_mac[ETH_ALEN];\t/* dest MAC address */\n \tu8 src_mac[ETH_ALEN];\t/* src MAC address */\n@@ -261,6 +277,9 @@ struct ice_fdir_fltr {\n \tstruct ice_fdir_ecpri ecpri_data;\n \tstruct ice_fdir_ecpri ecpri_mask;\n \n+\tstruct ice_fdir_l2tpv2 l2tpv2_data;\n+\tstruct ice_fdir_l2tpv2 l2tpv2_mask;\n+\n \tstruct ice_fdir_extra ext_data;\n \tstruct ice_fdir_extra ext_mask;\n \ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex af56849482..6d0adf0dd1 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -282,6 +282,15 @@ struct ice_phy_info {\n \n #define ICE_MAX_NUM_MIRROR_RULES\t64\n \n+#define ICE_L2TPV2_FLAGS_CTRL\t0x8000\n+#define ICE_L2TPV2_FLAGS_LEN\t0x4000\n+#define ICE_L2TPV2_FLAGS_SEQ\t0x0800\n+#define ICE_L2TPV2_FLAGS_OFF\t0x0200\n+#define ICE_L2TPV2_FLAGS_VER\t0x0002\n+\n+#define ICE_L2TPV2_PKT_LENGTH\t6\n+#define ICE_PPP_PKT_LENGTH\t4\n+\n /* protocol enumeration for filters */\n enum ice_fltr_ptype {\n \t/* NONE - used for undef/error */\n@@ -479,6 +488,24 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP,\n \tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP,\n \tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_CONTROL,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_UDP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV4_TCP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_UDP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV2_PPP_IPV6_TCP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_CONTROL,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_UDP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV4_TCP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_UDP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_L2TPV2_PPP_IPV6_TCP,\n \tICE_FLTR_PTYPE_MAX,\n };\n \n",
    "prefixes": [
        "v2",
        "56/70"
    ]
}