{"id":2221403,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2221403/?format=json","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.0/projects/46/?format=json","name":"Intel Wired Ethernet development","link_name":"intel-wired-lan","list_id":"intel-wired-lan.osuosl.org","list_email":"intel-wired-lan@osuosl.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260409120003.2719-2-marcin.szycik@linux.intel.com>","date":"2026-04-09T11:59:54","name":"[iwl-next,v2,01/10] ice: rename shared Flow Director functions and structs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7cd4a035159cc82fafc0e05e623227d8a0782942","submitter":{"id":82782,"url":"http://patchwork.ozlabs.org/api/1.0/people/82782/?format=json","name":"Marcin Szycik","email":"marcin.szycik@linux.intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260409120003.2719-2-marcin.szycik@linux.intel.com/mbox/","series":[{"id":499287,"url":"http://patchwork.ozlabs.org/api/1.0/series/499287/?format=json","date":"2026-04-09T11:59:53","name":"Add ACL support","version":2,"mbox":"http://patchwork.ozlabs.org/series/499287/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221403/checks/","tags":{},"headers":{"Return-Path":"<intel-wired-lan-bounces@osuosl.org>","X-Original-To":["incoming@patchwork.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=Yg0b2nzx;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fs0R6094tz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 09 Apr 2026 23:00:34 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id A49B141068;\n\tThu,  9 Apr 2026 13:00:32 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 3G9TWbH3dDQo; Thu,  9 Apr 2026 13:00:30 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 2EBC040BB1;\n\tThu,  9 Apr 2026 13:00:30 +0000 (UTC)","from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n by lists1.osuosl.org (Postfix) with ESMTP id B6843237\n for <intel-wired-lan@lists.osuosl.org>; Thu,  9 Apr 2026 13:00:28 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id 9C87A403BB\n for <intel-wired-lan@lists.osuosl.org>; Thu,  9 Apr 2026 13:00:28 +0000 (UTC)","from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 4AmTytvDmfu4 for <intel-wired-lan@lists.osuosl.org>;\n Thu,  9 Apr 2026 13:00:27 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [192.198.163.19])\n by smtp2.osuosl.org (Postfix) with ESMTPS id 2873740127\n for <intel-wired-lan@lists.osuosl.org>; Thu,  9 Apr 2026 13:00:27 +0000 (UTC)","from orviesa002.jf.intel.com ([10.64.159.142])\n by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Apr 2026 06:00:17 -0700","from irvmail002.ir.intel.com ([10.43.11.120])\n by orviesa002.jf.intel.com with ESMTP; 09 Apr 2026 06:00:12 -0700","from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id 7431C2FC5C;\n Thu,  9 Apr 2026 14:00:11 +0100 (IST)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2EBC040BB1","OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2873740127"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1775739630;\n\tbh=1werp1bAnMAyyF/9mFqYIqfZ+AlXSiPBMYvYmnDqEOQ=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=Yg0b2nzxGiQlzJWfqvE3WexU5ZWgcDtx3EIKA0Inr/L6O05o1AL2Ubp3bxsiAbezC\n\t 6iPPNgfcq7EjJDIjRLrJaPHpEvkgHbn22E4TPQB3Re8T0JbaAXVLu53JEfWKUzHkYY\n\t yNCkJ3nZpZFc+956m2rfxVT4Aqg801mM8qEoQBvLYNkQ1NhMMn+ec8jQE/EFqKiohM\n\t pnjpCcvZ54Syn9ica38/IYNzp8sM0cps6KN745HZW2lrlSj1rkqazDFfU98f/WeBzr\n\t R0kTd697QM5WzsYer5cxojf3PWzor90J2udAXZU5xevwWa0AZzx9ZScj6J7aPYo45A\n\t mEqih/7gyksAw==","Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.19;\n helo=mgamail.intel.com; envelope-from=marcin.szycik@linux.intel.com;\n receiver=<UNKNOWN>","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp2.osuosl.org 2873740127","X-CSE-ConnectionGUID":["5OfphlNnTNq1dWaVT9RRow==","eeD5CAlaTjO+w9AKnhjLWg=="],"X-CSE-MsgGUID":["RrrwDPLvRfmpKRLH8l9K0g==","r+aOWgxxQ+2J8mq9DYLhuA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11753\"; a=\"75777518\"","E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"75777518\"","E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"259208101\""],"X-ExtLoop1":"1","From":"Marcin Szycik <marcin.szycik@linux.intel.com>","To":"intel-wired-lan@lists.osuosl.org","Cc":"netdev@vger.kernel.org, sandeep.penigalapati@intel.com,\n ananth.s@intel.com,\n alexander.duyck@gmail.com, Marcin Szycik <marcin.szycik@linux.intel.com>,\n Tony Nguyen <anthony.l.nguyen@intel.com>,\n Aleksandr Loktionov <aleksandr.loktionov@intel.com>","Date":"Thu,  9 Apr 2026 13:59:54 +0200","Message-ID":"<20260409120003.2719-2-marcin.szycik@linux.intel.com>","X-Mailer":"git-send-email 2.49.0","In-Reply-To":"<20260409120003.2719-1-marcin.szycik@linux.intel.com>","References":"<20260409120003.2719-1-marcin.szycik@linux.intel.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Mailman-Original-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775739627; x=1807275627;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=QbkLmemqcjIzQYZ1I3jo72JD1NJSaQSWGsXhf58eP50=;\n b=hJVfmLhibcAD4JIPhcJbzf387nT2UrDyluwAHRH+IzZ2mLqogX9MXnz2\n H7yQ1e4z4fva3YylvWB50hn6gU7ABzYwr2toLTz2tL6s89cCmNlmzTpta\n OzvRtYYhCnmGzXW529XJmIDKftHCHVDi7gnu3PgxS8zVY/L3qSMzZ+BRp\n 7Xgfclx40pIlXmhIJsI4ovdEmFr03ghqOM/wgO51l3DHHSpejtvqjl2us\n mcaf8EvnXu8HgYLWd531nhPSFcgcv4C28KtrKPUYY9Ta5VxhS/m7Sl4Mc\n BDulCtrE0UU9dzLMJNZOi240aGYkcAMGyZd/8EZU8qE3JZvoWI9EDzw7F\n w==;","X-Mailman-Original-Authentication-Results":["smtp2.osuosl.org;\n dmarc=none (p=none dis=none)\n header.from=linux.intel.com","smtp2.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=hJVfmLhi"],"Subject":"[Intel-wired-lan] [PATCH iwl-next v2 01/10] ice: rename shared Flow\n Director functions and structs","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>","List-Unsubscribe":"<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>","List-Archive":"<http://lists.osuosl.org/pipermail/intel-wired-lan/>","List-Post":"<mailto:intel-wired-lan@osuosl.org>","List-Help":"<mailto:intel-wired-lan-request@osuosl.org?subject=help>","List-Subscribe":"<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>"},"content":"From: Tony Nguyen <anthony.l.nguyen@intel.com>\n\nRename shared Flow Director functions and structs. These entities are\ncurrently used to add Flow Director filters, however, they will be\nexpanded to also add ACL filters. Rename the functions and struct,\nreplacing 'fdir' to 'ntuple', to reflect that they are being used for\nntuple filters and are not solely used for Flow Director.\n\nRename the file to also reflect this change.\n\nCo-developed-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\nReviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\nCo-developed-by: Marcin Szycik <marcin.szycik@linux.intel.com>\nSigned-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>\n---\nv2:\n* Also rename struct ice_fdir_fltr and file\n---\n drivers/net/ethernet/intel/ice/Makefile       |  2 +-\n drivers/net/ethernet/intel/ice/ice.h          |  6 +-\n drivers/net/ethernet/intel/ice/ice_arfs.h     |  2 +-\n drivers/net/ethernet/intel/ice/ice_fdir.h     | 12 ++--\n drivers/net/ethernet/intel/ice/ice_arfs.c     |  8 +--\n drivers/net/ethernet/intel/ice/ice_ethtool.c  |  4 +-\n ...ce_ethtool_fdir.c => ice_ethtool_ntuple.c} | 58 ++++++++++---------\n drivers/net/ethernet/intel/ice/ice_fdir.c     | 18 +++---\n drivers/net/ethernet/intel/ice/virt/fdir.c    | 28 ++++-----\n 9 files changed, 70 insertions(+), 68 deletions(-)\n rename drivers/net/ethernet/intel/ice/{ice_ethtool_fdir.c => ice_ethtool_ntuple.c} (97%)","diff":"diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile\nindex 5b2c666496e7..c310c209bc7d 100644\n--- a/drivers/net/ethernet/intel/ice/Makefile\n+++ b/drivers/net/ethernet/intel/ice/Makefile\n@@ -24,7 +24,7 @@ ice-y := ice_main.o\t\\\n \t ice_vsi_vlan_ops.o \\\n \t ice_vsi_vlan_lib.o \\\n \t ice_fdir.o\t\\\n-\t ice_ethtool_fdir.o \\\n+\t ice_ethtool_ntuple.o \\\n \t ice_vlan_mode.o \\\n \t ice_flex_pipe.o \\\n \t ice_flow.o\t\\\ndiff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 804f5aa8e9f5..ea1bddfa739d 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -1015,11 +1015,11 @@ void ice_deinit_rdma(struct ice_pf *pf);\n bool ice_is_wol_supported(struct ice_hw *hw);\n void ice_fdir_del_all_fltrs(struct ice_vsi *vsi);\n int\n-ice_fdir_write_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, bool add,\n+ice_fdir_write_fltr(struct ice_pf *pf, struct ice_ntuple_fltr *input, bool add,\n \t\t    bool is_tun);\n void ice_vsi_manage_fdir(struct ice_vsi *vsi, bool ena);\n-int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd);\n-int ice_del_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd);\n+int ice_add_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd);\n+int ice_del_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd);\n int ice_get_ethtool_fdir_entry(struct ice_hw *hw, struct ethtool_rxnfc *cmd);\n int\n ice_get_fdir_fltr_ids(struct ice_hw *hw, struct ethtool_rxnfc *cmd,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_arfs.h b/drivers/net/ethernet/intel/ice/ice_arfs.h\nindex 9706293128c3..7393254b7e0a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_arfs.h\n+++ b/drivers/net/ethernet/intel/ice/ice_arfs.h\n@@ -13,7 +13,7 @@ enum ice_arfs_fltr_state {\n };\n \n struct ice_arfs_entry {\n-\tstruct ice_fdir_fltr fltr_info;\n+\tstruct ice_ntuple_fltr fltr_info;\n \tstruct hlist_node list_entry;\n \tu64 time_activated;\t/* only valid for UDP flows */\n \tu32 flow_id;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_fdir.h b/drivers/net/ethernet/intel/ice/ice_fdir.h\nindex 820023c0271f..26d79b1364e7 100644\n--- a/drivers/net/ethernet/intel/ice/ice_fdir.h\n+++ b/drivers/net/ethernet/intel/ice/ice_fdir.h\n@@ -160,7 +160,7 @@ struct ice_fdir_extra {\n \t__be16 vlan_tag;\t/* VLAN tag info */\n };\n \n-struct ice_fdir_fltr {\n+struct ice_ntuple_fltr {\n \tstruct list_head fltr_node;\n \tenum ice_fltr_ptype flow_type;\n \n@@ -216,18 +216,18 @@ int ice_free_fd_res_cntr(struct ice_hw *hw, u16 cntr_id);\n int ice_alloc_fd_guar_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);\n int ice_alloc_fd_shrd_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);\n void\n-ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,\n+ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_ntuple_fltr *input,\n \t\t       struct ice_fltr_desc *fdesc, bool add);\n int\n-ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n+ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_ntuple_fltr *input,\n \t\t\t  u8 *pkt, bool frag, bool tun);\n int ice_get_fdir_cnt_all(struct ice_hw *hw);\n int ice_fdir_num_avail_fltr(struct ice_hw *hw, struct ice_vsi *vsi);\n-bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_fdir_fltr *input);\n+bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_ntuple_fltr *input);\n bool ice_fdir_has_frag(enum ice_fltr_ptype flow);\n-struct ice_fdir_fltr *\n+struct ice_ntuple_fltr *\n ice_fdir_find_fltr_by_idx(struct ice_hw *hw, u32 fltr_idx);\n void\n ice_fdir_update_cntrs(struct ice_hw *hw, enum ice_fltr_ptype flow, bool add);\n-void ice_fdir_list_add_fltr(struct ice_hw *hw, struct ice_fdir_fltr *input);\n+void ice_fdir_list_add_fltr(struct ice_hw *hw, struct ice_ntuple_fltr *input);\n #endif /* _ICE_FDIR_H_ */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_arfs.c b/drivers/net/ethernet/intel/ice/ice_arfs.c\nindex 53b6e2b09eb9..e0335f5e18fe 100644\n--- a/drivers/net/ethernet/intel/ice/ice_arfs.c\n+++ b/drivers/net/ethernet/intel/ice/ice_arfs.c\n@@ -302,7 +302,7 @@ ice_arfs_build_entry(struct ice_vsi *vsi, const struct flow_keys *fk,\n \t\t     u16 rxq_idx, u32 flow_id)\n {\n \tstruct ice_arfs_entry *arfs_entry;\n-\tstruct ice_fdir_fltr *fltr_info;\n+\tstruct ice_ntuple_fltr *fltr_info;\n \tu8 ip_proto;\n \n \tarfs_entry = devm_kzalloc(ice_pf_to_dev(vsi->back),\n@@ -392,8 +392,8 @@ ice_arfs_is_perfect_flow_set(struct ice_hw *hw, __be16 l3_proto, u8 l4_proto)\n  * * false\t- fltr_info and fk refer to different flows.\n  */\n static bool\n-ice_arfs_cmp(const struct ice_fdir_fltr *fltr_info, const struct flow_keys *fk,\n-\t     __be16 n_proto, u8 ip_proto)\n+ice_arfs_cmp(const struct ice_ntuple_fltr *fltr_info,\n+\t     const struct flow_keys *fk, __be16 n_proto, u8 ip_proto)\n {\n \t/* Determine if the filter is for IPv4 or IPv6 based on flow_type,\n \t * which is one of ICE_FLTR_PTYPE_NONF_IPV{4,6}_{TCP,UDP}.\n@@ -485,7 +485,7 @@ ice_rx_flow_steer(struct net_device *netdev, const struct sk_buff *skb,\n \tspin_lock_bh(&vsi->arfs_lock);\n \thlist_for_each_entry(arfs_entry, &vsi->arfs_fltr_list[idx],\n \t\t\t     list_entry) {\n-\t\tstruct ice_fdir_fltr *fltr_info;\n+\t\tstruct ice_ntuple_fltr *fltr_info;\n \n \t\t/* keep searching for the already existing arfs_entry flow */\n \t\tif (arfs_entry->flow_id != flow_id)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex ba4def92c3e8..1495d96b5c98 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -3106,9 +3106,9 @@ static int ice_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)\n \n \tswitch (cmd->cmd) {\n \tcase ETHTOOL_SRXCLSRLINS:\n-\t\treturn ice_add_fdir_ethtool(vsi, cmd);\n+\t\treturn ice_add_ntuple_ethtool(vsi, cmd);\n \tcase ETHTOOL_SRXCLSRLDEL:\n-\t\treturn ice_del_fdir_ethtool(vsi, cmd);\n+\t\treturn ice_del_ntuple_ethtool(vsi, cmd);\n \tdefault:\n \t\tbreak;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c\nsimilarity index 97%\nrename from drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c\nrename to drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c\nindex aceec184e89b..a6136e640418 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c\n@@ -120,7 +120,7 @@ static bool ice_is_mask_valid(u64 mask, u64 field)\n int ice_get_ethtool_fdir_entry(struct ice_hw *hw, struct ethtool_rxnfc *cmd)\n {\n \tstruct ethtool_rx_flow_spec *fsp;\n-\tstruct ice_fdir_fltr *rule;\n+\tstruct ice_ntuple_fltr *rule;\n \tint ret = 0;\n \tu16 idx;\n \n@@ -240,7 +240,7 @@ int\n ice_get_fdir_fltr_ids(struct ice_hw *hw, struct ethtool_rxnfc *cmd,\n \t\t      u32 *rule_locs)\n {\n-\tstruct ice_fdir_fltr *f_rule;\n+\tstruct ice_ntuple_fltr *f_rule;\n \tunsigned int cnt = 0;\n \tint val = 0;\n \n@@ -1487,10 +1487,10 @@ static void ice_update_per_q_fltr(struct ice_vsi *vsi, u32 q_index, bool inc)\n  * @add: true adds filter and false removed filter\n  * @is_tun: true adds inner filter on tunnel and false outer headers\n  *\n- * returns 0 on success and negative value on error\n+ * Return: 0 on success and negative value on error\n  */\n int\n-ice_fdir_write_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, bool add,\n+ice_fdir_write_fltr(struct ice_pf *pf, struct ice_ntuple_fltr *input, bool add,\n \t\t    bool is_tun)\n {\n \tstruct device *dev = ice_pf_to_dev(pf);\n@@ -1557,10 +1557,10 @@ ice_fdir_write_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, bool add,\n  * @input: filter structure\n  * @add: true adds filter and false removed filter\n  *\n- * returns 0 on success and negative value on error\n+ * Return: 0 on success and negative value on error\n  */\n static int\n-ice_fdir_write_all_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input,\n+ice_fdir_write_all_fltr(struct ice_pf *pf, struct ice_ntuple_fltr *input,\n \t\t\tbool add)\n {\n \tu16 port_num;\n@@ -1585,7 +1585,7 @@ ice_fdir_write_all_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input,\n  */\n void ice_fdir_replay_fltrs(struct ice_pf *pf)\n {\n-\tstruct ice_fdir_fltr *f_rule;\n+\tstruct ice_ntuple_fltr *f_rule;\n \tstruct ice_hw *hw = &pf->hw;\n \n \tlist_for_each_entry(f_rule, &hw->fdir_list_head, fltr_node) {\n@@ -1630,7 +1630,7 @@ int ice_fdir_create_dflt_rules(struct ice_pf *pf)\n  */\n void ice_fdir_del_all_fltrs(struct ice_vsi *vsi)\n {\n-\tstruct ice_fdir_fltr *f_rule, *tmp;\n+\tstruct ice_ntuple_fltr *f_rule, *tmp;\n \tstruct ice_pf *pf = vsi->back;\n \tstruct ice_hw *hw = &pf->hw;\n \n@@ -1701,18 +1701,18 @@ ice_fdir_do_rem_flow(struct ice_pf *pf, enum ice_fltr_ptype flow_type)\n }\n \n /**\n- * ice_fdir_update_list_entry - add or delete a filter from the filter list\n+ * ice_ntuple_update_list_entry - add or delete a filter from the filter list\n  * @pf: PF structure\n  * @input: filter structure\n  * @fltr_idx: ethtool index of filter to modify\n  *\n- * returns 0 on success and negative on errors\n+ * Return: 0 on success and negative on errors\n  */\n static int\n-ice_fdir_update_list_entry(struct ice_pf *pf, struct ice_fdir_fltr *input,\n-\t\t\t   int fltr_idx)\n+ice_ntuple_update_list_entry(struct ice_pf *pf, struct ice_ntuple_fltr *input,\n+\t\t\t     int fltr_idx)\n {\n-\tstruct ice_fdir_fltr *old_fltr;\n+\tstruct ice_ntuple_fltr *old_fltr;\n \tstruct ice_hw *hw = &pf->hw;\n \tstruct ice_vsi *vsi;\n \tint err = -ENOENT;\n@@ -1751,13 +1751,13 @@ ice_fdir_update_list_entry(struct ice_pf *pf, struct ice_fdir_fltr *input,\n }\n \n /**\n- * ice_del_fdir_ethtool - delete Flow Director filter\n+ * ice_del_ntuple_ethtool - delete Flow Director or ACL filter\n  * @vsi: pointer to target VSI\n- * @cmd: command to add or delete Flow Director filter\n+ * @cmd: command to add or delete the filter\n  *\n- * Returns 0 on success and negative values for failure\n+ * Return: 0 on success and negative values for failure\n  */\n-int ice_del_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n+int ice_del_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n {\n \tstruct ethtool_rx_flow_spec *fsp =\n \t\t(struct ethtool_rx_flow_spec *)&cmd->fs;\n@@ -1778,7 +1778,7 @@ int ice_del_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n \t\treturn -EBUSY;\n \n \tmutex_lock(&hw->fdir_fltr_lock);\n-\tval = ice_fdir_update_list_entry(pf, NULL, fsp->location);\n+\tval = ice_ntuple_update_list_entry(pf, NULL, fsp->location);\n \tmutex_unlock(&hw->fdir_fltr_lock);\n \n \treturn val;\n@@ -1818,14 +1818,16 @@ ice_update_ring_dest_vsi(struct ice_vsi *vsi, u16 *dest_vsi, u32 *ring)\n }\n \n /**\n- * ice_set_fdir_input_set - Set the input set for Flow Director\n+ * ice_ntuple_set_input_set - Set the input set for Flow Director\n  * @vsi: pointer to target VSI\n  * @fsp: pointer to ethtool Rx flow specification\n  * @input: filter structure\n+ *\n+ * Return: 0 on success, negative on failure\n  */\n static int\n-ice_set_fdir_input_set(struct ice_vsi *vsi, struct ethtool_rx_flow_spec *fsp,\n-\t\t       struct ice_fdir_fltr *input)\n+ice_ntuple_set_input_set(struct ice_vsi *vsi, struct ethtool_rx_flow_spec *fsp,\n+\t\t\t struct ice_ntuple_fltr *input)\n {\n \ts16 q_index = ICE_FDIR_NO_QUEUE_IDX;\n \tu16 orig_q_index = 0;\n@@ -1968,17 +1970,17 @@ ice_set_fdir_input_set(struct ice_vsi *vsi, struct ethtool_rx_flow_spec *fsp,\n }\n \n /**\n- * ice_add_fdir_ethtool - Add/Remove Flow Director filter\n+ * ice_add_ntuple_ethtool - Add/Remove Flow Director or ACL filter\n  * @vsi: pointer to target VSI\n- * @cmd: command to add or delete Flow Director filter\n+ * @cmd: command to add or delete the filter\n  *\n- * Returns 0 on success and negative values for failure\n+ * Return: 0 on success and negative values for failure\n  */\n-int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n+int ice_add_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n {\n \tstruct ice_rx_flow_userdef userdata;\n \tstruct ethtool_rx_flow_spec *fsp;\n-\tstruct ice_fdir_fltr *input;\n+\tstruct ice_ntuple_fltr *input;\n \tstruct device *dev;\n \tstruct ice_pf *pf;\n \tstruct ice_hw *hw;\n@@ -2034,7 +2036,7 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n \tif (!input)\n \t\treturn -ENOMEM;\n \n-\tret = ice_set_fdir_input_set(vsi, fsp, input);\n+\tret = ice_ntuple_set_input_set(vsi, fsp, input);\n \tif (ret)\n \t\tgoto free_input;\n \n@@ -2055,7 +2057,7 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n \tinput->comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW_FAIL;\n \n \t/* input struct is added to the HW filter list */\n-\tret = ice_fdir_update_list_entry(pf, input, fsp->location);\n+\tret = ice_ntuple_update_list_entry(pf, input, fsp->location);\n \tif (ret)\n \t\tgoto release_lock;\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_fdir.c b/drivers/net/ethernet/intel/ice/ice_fdir.c\nindex b29fbdec9442..5b25f6414b58 100644\n--- a/drivers/net/ethernet/intel/ice/ice_fdir.c\n+++ b/drivers/net/ethernet/intel/ice/ice_fdir.c\n@@ -648,7 +648,7 @@ ice_set_fd_desc_val(struct ice_fd_fltr_desc_ctx *ctx,\n  * @add: if add is true, this is an add operation, false implies delete\n  */\n void\n-ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,\n+ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_ntuple_fltr *input,\n \t\t       struct ice_fltr_desc *fdesc, bool add)\n {\n \tstruct ice_fd_fltr_desc_ctx fdir_fltr_ctx = { 0 };\n@@ -855,7 +855,7 @@ static void ice_pkt_insert_mac_addr(u8 *pkt, u8 *addr)\n  * @tun: true implies generate a tunnel packet\n  */\n int\n-ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n+ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_ntuple_fltr *input,\n \t\t\t  u8 *pkt, bool frag, bool tun)\n {\n \tenum ice_fltr_ptype flow;\n@@ -1138,10 +1138,10 @@ bool ice_fdir_has_frag(enum ice_fltr_ptype flow)\n  *\n  * Returns pointer to filter if found or null\n  */\n-struct ice_fdir_fltr *\n+struct ice_ntuple_fltr *\n ice_fdir_find_fltr_by_idx(struct ice_hw *hw, u32 fltr_idx)\n {\n-\tstruct ice_fdir_fltr *rule;\n+\tstruct ice_ntuple_fltr *rule;\n \n \tlist_for_each_entry(rule, &hw->fdir_list_head, fltr_node) {\n \t\t/* rule ID found in the list */\n@@ -1158,9 +1158,9 @@ ice_fdir_find_fltr_by_idx(struct ice_hw *hw, u32 fltr_idx)\n  * @hw: hardware structure\n  * @fltr: filter node to add to structure\n  */\n-void ice_fdir_list_add_fltr(struct ice_hw *hw, struct ice_fdir_fltr *fltr)\n+void ice_fdir_list_add_fltr(struct ice_hw *hw, struct ice_ntuple_fltr *fltr)\n {\n-\tstruct ice_fdir_fltr *rule, *parent = NULL;\n+\tstruct ice_ntuple_fltr *rule, *parent = NULL;\n \n \tlist_for_each_entry(rule, &hw->fdir_list_head, fltr_node) {\n \t\t/* rule ID found or pass its spot in the list */\n@@ -1215,7 +1215,7 @@ static int ice_cmp_ipv6_addr(__be32 *a, __be32 *b)\n  * Returns true if the filters match\n  */\n static bool\n-ice_fdir_comp_rules(struct ice_fdir_fltr *a,  struct ice_fdir_fltr *b)\n+ice_fdir_comp_rules(struct ice_ntuple_fltr *a,  struct ice_ntuple_fltr *b)\n {\n \tenum ice_fltr_ptype flow_type = a->flow_type;\n \n@@ -1275,9 +1275,9 @@ ice_fdir_comp_rules(struct ice_fdir_fltr *a,  struct ice_fdir_fltr *b)\n  *\n  * Returns true if the filter is found in the list\n  */\n-bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_fdir_fltr *input)\n+bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_ntuple_fltr *input)\n {\n-\tstruct ice_fdir_fltr *rule;\n+\tstruct ice_ntuple_fltr *rule;\n \tbool ret = false;\n \n \tlist_for_each_entry(rule, &hw->fdir_list_head, fltr_node) {\ndiff --git a/drivers/net/ethernet/intel/ice/virt/fdir.c b/drivers/net/ethernet/intel/ice/virt/fdir.c\nindex 4f1f3442e52c..eca9eda04f31 100644\n--- a/drivers/net/ethernet/intel/ice/virt/fdir.c\n+++ b/drivers/net/ethernet/intel/ice/virt/fdir.c\n@@ -38,7 +38,7 @@ enum ice_fdir_tunnel_type {\n };\n \n struct virtchnl_fdir_fltr_conf {\n-\tstruct ice_fdir_fltr input;\n+\tstruct ice_ntuple_fltr input;\n \tenum ice_fdir_tunnel_type ttype;\n \tu64 inset_flag;\n \tu32 flow_id;\n@@ -567,12 +567,12 @@ static bool\n ice_vc_fdir_has_prof_conflict(struct ice_vf *vf,\n \t\t\t      struct virtchnl_fdir_fltr_conf *conf)\n {\n-\tstruct ice_fdir_fltr *desc;\n+\tstruct ice_ntuple_fltr *desc;\n \n \tlist_for_each_entry(desc, &vf->fdir.fdir_rule_list, fltr_node) {\n \t\tstruct virtchnl_fdir_fltr_conf *existing_conf;\n \t\tenum ice_fltr_ptype flow_type_a, flow_type_b;\n-\t\tstruct ice_fdir_fltr *a, *b;\n+\t\tstruct ice_ntuple_fltr *a, *b;\n \n \t\texisting_conf = to_fltr_conf_from_desc(desc);\n \t\ta = &existing_conf->input;\n@@ -748,7 +748,7 @@ static int\n ice_vc_fdir_config_input_set(struct ice_vf *vf, struct virtchnl_fdir_add *fltr,\n \t\t\t     struct virtchnl_fdir_fltr_conf *conf, int tun)\n {\n-\tstruct ice_fdir_fltr *input = &conf->input;\n+\tstruct ice_ntuple_fltr *input = &conf->input;\n \tstruct device *dev = ice_pf_to_dev(vf->pf);\n \tstruct ice_flow_seg_info *seg;\n \tenum ice_fltr_ptype flow;\n@@ -924,8 +924,8 @@ ice_vc_fdir_parse_pattern(struct ice_vf *vf, struct virtchnl_fdir_add *fltr,\n \tstruct virtchnl_proto_hdrs *proto = &fltr->rule_cfg.proto_hdrs;\n \tenum virtchnl_proto_hdr_type l3 = VIRTCHNL_PROTO_HDR_NONE;\n \tenum virtchnl_proto_hdr_type l4 = VIRTCHNL_PROTO_HDR_NONE;\n+\tstruct ice_ntuple_fltr *input = &conf->input;\n \tstruct device *dev = ice_pf_to_dev(vf->pf);\n-\tstruct ice_fdir_fltr *input = &conf->input;\n \tint i;\n \n \tif (proto->count > VIRTCHNL_MAX_NUM_PROTO_HDRS) {\n@@ -1150,8 +1150,8 @@ ice_vc_fdir_parse_action(struct ice_vf *vf, struct virtchnl_fdir_add *fltr,\n \t\t\t struct virtchnl_fdir_fltr_conf *conf)\n {\n \tstruct virtchnl_filter_action_set *as = &fltr->rule_cfg.action_set;\n+\tstruct ice_ntuple_fltr *input = &conf->input;\n \tstruct device *dev = ice_pf_to_dev(vf->pf);\n-\tstruct ice_fdir_fltr *input = &conf->input;\n \tu32 dest_num = 0;\n \tu32 mark_num = 0;\n \tint i;\n@@ -1249,8 +1249,8 @@ static bool\n ice_vc_fdir_comp_rules(struct virtchnl_fdir_fltr_conf *conf_a,\n \t\t       struct virtchnl_fdir_fltr_conf *conf_b)\n {\n-\tstruct ice_fdir_fltr *a = &conf_a->input;\n-\tstruct ice_fdir_fltr *b = &conf_b->input;\n+\tstruct ice_ntuple_fltr *a = &conf_a->input;\n+\tstruct ice_ntuple_fltr *b = &conf_b->input;\n \n \tif (conf_a->ttype != conf_b->ttype)\n \t\treturn false;\n@@ -1288,7 +1288,7 @@ ice_vc_fdir_comp_rules(struct virtchnl_fdir_fltr_conf *conf_a,\n static bool\n ice_vc_fdir_is_dup_fltr(struct ice_vf *vf, struct virtchnl_fdir_fltr_conf *conf)\n {\n-\tstruct ice_fdir_fltr *desc;\n+\tstruct ice_ntuple_fltr *desc;\n \tbool ret;\n \n \tlist_for_each_entry(desc, &vf->fdir.fdir_rule_list, fltr_node) {\n@@ -1317,7 +1317,7 @@ static int\n ice_vc_fdir_insert_entry(struct ice_vf *vf,\n \t\t\t struct virtchnl_fdir_fltr_conf *conf, u32 *id)\n {\n-\tstruct ice_fdir_fltr *input = &conf->input;\n+\tstruct ice_ntuple_fltr *input = &conf->input;\n \tint i;\n \n \t/* alloc ID corresponding with conf */\n@@ -1341,7 +1341,7 @@ static void\n ice_vc_fdir_remove_entry(struct ice_vf *vf,\n \t\t\t struct virtchnl_fdir_fltr_conf *conf, u32 id)\n {\n-\tstruct ice_fdir_fltr *input = &conf->input;\n+\tstruct ice_ntuple_fltr *input = &conf->input;\n \n \tidr_remove(&vf->fdir.fdir_rule_idr, id);\n \tlist_del(&input->fltr_node);\n@@ -1367,7 +1367,7 @@ ice_vc_fdir_lookup_entry(struct ice_vf *vf, u32 id)\n static void ice_vc_fdir_flush_entry(struct ice_vf *vf)\n {\n \tstruct virtchnl_fdir_fltr_conf *conf;\n-\tstruct ice_fdir_fltr *desc, *temp;\n+\tstruct ice_ntuple_fltr *desc, *temp;\n \n \tlist_for_each_entry_safe(desc, temp,\n \t\t\t\t &vf->fdir.fdir_rule_list, fltr_node) {\n@@ -1390,7 +1390,7 @@ static int ice_vc_fdir_write_fltr(struct ice_vf *vf,\n \t\t\t\t  struct virtchnl_fdir_fltr_conf *conf,\n \t\t\t\t  bool add, bool is_tun)\n {\n-\tstruct ice_fdir_fltr *input = &conf->input;\n+\tstruct ice_ntuple_fltr *input = &conf->input;\n \tstruct ice_vsi *vsi, *ctrl_vsi;\n \tstruct ice_fltr_desc desc;\n \tstruct device *dev;\n@@ -2315,7 +2315,7 @@ int ice_vc_del_fdir_fltr(struct ice_vf *vf, u8 *msg)\n \tstruct virtchnl_fdir_fltr_conf *conf;\n \tstruct ice_vf_fdir *fdir = &vf->fdir;\n \tenum virtchnl_status_code v_ret;\n-\tstruct ice_fdir_fltr *input;\n+\tstruct ice_ntuple_fltr *input;\n \tenum ice_fltr_ptype flow;\n \tstruct device *dev;\n \tstruct ice_pf *pf;\n","prefixes":["iwl-next","v2","01/10"]}