Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76174/?format=api
{ "id": 76174, "url": "https://patches.dpdk.org/api/patches/76174/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200831065817.30923-1-wei.zhao1@intel.com/", "project": { "id": 1, "url": "https://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": "<20200831065817.30923-1-wei.zhao1@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200831065817.30923-1-wei.zhao1@intel.com", "date": "2020-08-31T06:58:17", "name": "[v4] net/ice: fix FDIR GTPU rule create fail", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "62c7e4fb3573c053042f30b3e1c8430fc8839d82", "submitter": { "id": 495, "url": "https://patches.dpdk.org/api/people/495/?format=api", "name": "Zhao1, Wei", "email": "wei.zhao1@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200831065817.30923-1-wei.zhao1@intel.com/mbox/", "series": [ { "id": 11857, "url": "https://patches.dpdk.org/api/series/11857/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=11857", "date": "2020-08-31T06:58:17", "name": "[v4] net/ice: fix FDIR GTPU rule create fail", "version": 4, "mbox": "https://patches.dpdk.org/series/11857/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/76174/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/76174/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 99211A04AB;\n\tMon, 31 Aug 2020 09:25:48 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7BEE6137D;\n\tMon, 31 Aug 2020 09:25:48 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by dpdk.org (Postfix) with ESMTP id EB22EDE0;\n Mon, 31 Aug 2020 09:25:45 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 31 Aug 2020 00:25:45 -0700", "from unknown (HELO localhost.localdomain.bj.intel.com)\n ([172.16.182.123])\n by orsmga005.jf.intel.com with ESMTP; 31 Aug 2020 00:25:43 -0700" ], "IronPort-SDR": [ "\n 0im/agRJlEv2a525DIymndRcpi0iu+bMXRrB9LSvMc/Dxg956FtjuiZ0QIbG2PfZs192WFC9EN\n 1ci4RDdMkapw==", "\n yVVUFsN5yOhdYge1Wa+jUvtselYnzq1DaDSGNLQmQbo4YNl3lvpxCXXKoKwrPeLvEn52OmIJ1B\n bKc9zf9xylsw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9729\"; a=\"156926794\"", "E=Sophos;i=\"5.76,374,1592895600\"; d=\"scan'208\";a=\"156926794\"", "E=Sophos;i=\"5.76,374,1592895600\"; d=\"scan'208\";a=\"476619135\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Wei Zhao <wei.zhao1@intel.com>", "To": "dev@dpdk.org", "Cc": "stable@dpdk.org,\n\tqi.z.zhang@intel.com,\n\tWei Zhao <wei.zhao1@intel.com>", "Date": "Mon, 31 Aug 2020 14:58:17 +0800", "Message-Id": "<20200831065817.30923-1-wei.zhao1@intel.com>", "X-Mailer": "git-send-email 2.19.1", "In-Reply-To": "<20200828011113.47466-1-wei.zhao1@intel.com>", "References": "<20200828011113.47466-1-wei.zhao1@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4] net/ice: fix FDIR GTPU rule create fail", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "For GTPU rule without extend header the trainning packet\nfor FDIR is different. This patch enable these case.\n\nFixes: 934fd00c9389 (\"net/ice/base: fix GTPU IP hash\")\nCc: stable@dpdk.org\n\nSigned-off-by: Wei Zhao <wei.zhao1@intel.com>\nTested-by: Huang ZhiminX <zhiminx.huang@intel.com>\n\n---\n\nv3: fix typo\n\nv4: fix bug\n---\n drivers/net/ice/base/ice_fdir.c | 65 ++++++++++++++++++++++++-\n drivers/net/ice/base/ice_type.h | 2 +\n drivers/net/ice/ice_fdir_filter.c | 80 +++++++++++++------------------\n 3 files changed, 98 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c\nindex 2c47fb57b..aea388f2a 100644\n--- a/drivers/net/ice/base/ice_fdir.c\n+++ b/drivers/net/ice/base/ice_fdir.c\n@@ -89,6 +89,37 @@ static const u8 ice_fdir_icmp4_gtpu4_pkt[] = {\n };\n \n static const u8 ice_fdir_ipv4_gtpu4_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x44, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x00,\n+\t0x00, 0x00, 0x33, 0xff, 0x00, 0x20, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x45, 0x00,\n+\t0x00, 0x14, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_ipv6_gtpu6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x44, 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, 0x08, 0x68,\n+\t0x08, 0x68, 0x00, 0x44, 0x7f, 0xed, 0x33, 0xff,\n+\t0x00, 0x34, 0x12, 0x34, 0x56, 0x78, 0x00, 0x00,\n+\t0x00, 0x85, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_ipv4_gtpu4_eh_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n \t0x00, 0x44, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,\n@@ -102,7 +133,7 @@ static const u8 ice_fdir_ipv4_gtpu4_pkt[] = {\n \t0x00, 0x00,\n };\n \n-static const u8 ice_fdir_ipv6_gtpu6_pkt[] = {\n+static const u8 ice_fdir_ipv6_gtpu6_eh_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,\n \t0x00, 0x00, 0x00, 0x44, 0x11, 0x40, 0x00, 0x00,\n@@ -492,6 +523,20 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {\n \t\tsizeof(ice_fdir_ipv6_gtpu6_pkt),\n \t\tice_fdir_ipv6_gtpu6_pkt,\n \t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER,\n+\t\tsizeof(ice_fdir_ipv4_gtpu4_eh_pkt),\n+\t\tice_fdir_ipv4_gtpu4_eh_pkt,\n+\t\tsizeof(ice_fdir_ipv4_gtpu4_eh_pkt),\n+\t\tice_fdir_ipv4_gtpu4_eh_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER,\n+\t\tsizeof(ice_fdir_ipv6_gtpu6_eh_pkt),\n+\t\tice_fdir_ipv6_gtpu6_eh_pkt,\n+\t\tsizeof(ice_fdir_ipv6_gtpu6_eh_pkt),\n+\t\tice_fdir_ipv6_gtpu6_eh_pkt,\n+\t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_IPV4_L2TPV3,\n \t\tsizeof(ice_fdir_ipv4_l2tpv3_pkt), ice_fdir_ipv4_l2tpv3_pkt,\n@@ -1049,10 +1094,18 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\t\t\t input->ip.v4.proto);\n \t\tice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);\n \t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER:\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\t\t\t input->ip.v4.src_ip);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\t\t\t input->ip.v4.dst_ip);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_GTPU_TEID_OFFSET,\n+\t\t\t\t input->gtpu_data.teid);\n+\t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP:\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP:\n-\tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER:\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.src_ip);\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n@@ -1063,6 +1116,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\t\t\t input->gtpu_data.qfi);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER:\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+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV6_GTPU_TEID_OFFSET,\n+\t\t\t\t input->gtpu_data.teid);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER:\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 \t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex c13cd7b00..3775689a9 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -297,6 +297,8 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP,\n \tICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER,\n \tICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER,\n+\tICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER,\n+\tICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER,\n \tICE_FLTR_PTYPE_NONF_IPV4_L2TPV3,\n \tICE_FLTR_PTYPE_NONF_IPV6_L2TPV3,\n \tICE_FLTR_PTYPE_NONF_IPV4_ESP,\ndiff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c\nindex 745d7291a..c4b7265ce 100644\n--- a/drivers/net/ice/ice_fdir_filter.c\n+++ b/drivers/net/ice/ice_fdir_filter.c\n@@ -778,30 +778,15 @@ ice_fdir_cross_prof_conflict(struct ice_pf *pf,\n \t\t\tgoto err;\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER:\n-\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER;\n+\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP;\n \t\tif (!ice_fdir_prof_resolve_conflict\n \t\t\t(pf, cflct_ptype, is_tunnel))\n \t\t\tgoto err;\n-\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER;\n+\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP;\n \t\tif (!ice_fdir_prof_resolve_conflict\n \t\t\t(pf, cflct_ptype, is_tunnel))\n \t\t\tgoto err;\n-\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER;\n-\t\tif (!ice_fdir_prof_resolve_conflict\n-\t\t\t(pf, cflct_ptype, is_tunnel))\n-\t\t\tgoto err;\n-\t\tbreak;\n-\t/* IPv6 GTPU */\n-\tcase ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER:\n-\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER;\n-\t\tif (!ice_fdir_prof_resolve_conflict\n-\t\t\t(pf, cflct_ptype, is_tunnel))\n-\t\t\tgoto err;\n-\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER;\n-\t\tif (!ice_fdir_prof_resolve_conflict\n-\t\t\t(pf, cflct_ptype, is_tunnel))\n-\t\t\tgoto err;\n-\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER;\n+\t\tcflct_ptype = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP;\n \t\tif (!ice_fdir_prof_resolve_conflict\n \t\t\t(pf, cflct_ptype, is_tunnel))\n \t\t\tgoto err;\n@@ -1025,30 +1010,26 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow,\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP:\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER:\n-\t\tif (ttype == ICE_FDIR_TUNNEL_TYPE_GTPU)\n-\t\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV4 |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n-\t\telse if (ttype == ICE_FDIR_TUNNEL_TYPE_GTPU_EH)\n-\t\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_GTPU_IP |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV4 |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n-\t\telse\n-\t\t\tPMD_DRV_LOG(ERR, \"not supported tunnel type.\");\n+\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER:\n+\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH |\n+\t\t\t\t ICE_FLOW_SEG_HDR_GTPU_IP |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER:\n-\t\tif (ttype == ICE_FDIR_TUNNEL_TYPE_GTPU)\n-\t\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV6 |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n-\t\telse if (ttype == ICE_FDIR_TUNNEL_TYPE_GTPU_EH)\n-\t\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_GTPU_IP |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV6 |\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n-\t\telse\n-\t\t\tPMD_DRV_LOG(ERR, \"not supported tunnel type.\");\n+\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER:\n+\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH |\n+\t\t\t\t ICE_FLOW_SEG_HDR_GTPU_IP |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NON_IP_L2:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_ETH_NON_IP);\n@@ -2007,13 +1988,18 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,\n \t\t}\n \t}\n \n-\tif (tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU ||\n-\t tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU_EH) {\n-\t\tif (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP)\n-\t\t\tflow_type = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER;\n-\t\telse\n-\t\t\tflow_type = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER;\n-\t}\n+\tif (tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU &&\n+\t\tflow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP)\n+\t\tflow_type = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER;\n+\telse if (tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU_EH &&\n+\t\tflow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP)\n+\t\tflow_type = ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER;\n+\telse if (tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU &&\n+\t\tflow_type == ICE_FLTR_PTYPE_NONF_IPV6_UDP)\n+\t\tflow_type = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER;\n+\telse if (tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU_EH &&\n+\t\tflow_type == ICE_FLTR_PTYPE_NONF_IPV6_UDP)\n+\t\tflow_type = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER;\n \n \tfilter->tunnel_type = tunnel_type;\n \tfilter->input.flow_type = flow_type;\n", "prefixes": [ "v4" ] }