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 EB470460C2; Mon, 20 Jan 2025 13:00:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D651540E0F; Mon, 20 Jan 2025 13:00:40 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by mails.dpdk.org (Postfix) with ESMTP id 4DAC640BA4 for ; Mon, 20 Jan 2025 13:00:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1737374438; x=1768910438; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eUwIyYNWEakY+Ocm54X3k8bD0BUA0exHYVzqtoY+EzU=; b=Q69KyDIIv9akaSHOCloT8xraxBE+hYGL7B3AUqnijs88PHltUE0FSNM1 q22Mb1W80n/nfqYvsCVgF9/YufCwO2snUlIm1jxRdJWKfhHht2StYiJao 1w1jwt5U7sbU0eO9LOs3IaNJ1nZxSKEqOfhcCpvTl9EAMYcF3NJibCxHS HjkPUQz6O9vO9erlVR4wYSvx0wBP4+CYG1AtG6DBQsNiu8lDR2YnIFwbs UcjLuaI8OzfaNXGCDFAHyZPz0oc8WemM7+c4tQMWj+PREC6CkVwsCeZMs aEBObznLXPVgVjFdPI2qV4as+CzGaXyKeqcItt8U5+e2Owxcrwl/AsRE2 A==; X-CSE-ConnectionGUID: MbNWQ4VISI685lF0pfx//w== X-CSE-MsgGUID: ++Ow/JZ+TYa9bFMk8WdlKA== X-IronPort-AV: E=McAfee;i="6700,10204,11320"; a="36978990" X-IronPort-AV: E=Sophos;i="6.13,219,1732608000"; d="scan'208";a="36978990" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2025 04:00:37 -0800 X-CSE-ConnectionGUID: ZuwOdaJaQ8GEuq+FXmJfAw== X-CSE-MsgGUID: ZaaZjwRMTCWHF0sTBvbXvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="143766752" Received: from silpixa00401197coob.ir.intel.com (HELO silpixa00401385.ir.intel.com) ([10.237.214.45]) by orviesa001.jf.intel.com with ESMTP; 20 Jan 2025 04:00:33 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Thomas Monjalon , Konstantin Ananyev , David Christensen , Wathsala Vithanage , Praveen Shetty , Ian Stokes , Vladimir Medvedkin , Anatoly Burakov , Jingjing Wu , Rosen Xu , Robin Jarry Subject: [PATCH v5 01/25] net: move intel drivers to intel subdirectory Date: Mon, 20 Jan 2025 11:59:43 +0000 Message-ID: <20250120120016.1530274-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250120120016.1530274-1-bruce.richardson@intel.com> References: <20241122125418.2857301-1-bruce.richardson@intel.com> <20250120120016.1530274-1-bruce.richardson@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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Consolidate all Intel HW NIC drivers into a driver/net/intel This matches the layout used for drivers in the kernel, and potentially enabling easier sharing among drivers. Signed-off-by: Bruce Richardson --- MAINTAINERS | 20 +++++++++---------- devtools/check-git-log.sh | 4 ++++ doc/api/doxy-api.conf.in | 6 +++--- drivers/meson.build | 6 +++++- drivers/net/{ => intel}/cpfl/cpfl_actions.h | 0 drivers/net/{ => intel}/cpfl/cpfl_controlq.c | 0 drivers/net/{ => intel}/cpfl/cpfl_controlq.h | 0 drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h | 0 drivers/net/{ => intel}/cpfl/cpfl_ethdev.c | 0 drivers/net/{ => intel}/cpfl/cpfl_ethdev.h | 0 drivers/net/{ => intel}/cpfl/cpfl_flow.c | 0 drivers/net/{ => intel}/cpfl/cpfl_flow.h | 0 .../{ => intel}/cpfl/cpfl_flow_engine_fxp.c | 0 .../net/{ => intel}/cpfl/cpfl_flow_parser.c | 0 .../net/{ => intel}/cpfl/cpfl_flow_parser.h | 0 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c | 0 drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h | 0 drivers/net/{ => intel}/cpfl/cpfl_logs.h | 0 .../net/{ => intel}/cpfl/cpfl_representor.c | 0 .../net/{ => intel}/cpfl/cpfl_representor.h | 0 drivers/net/{ => intel}/cpfl/cpfl_rules.c | 0 drivers/net/{ => intel}/cpfl/cpfl_rules.h | 0 drivers/net/{ => intel}/cpfl/cpfl_rxtx.c | 0 drivers/net/{ => intel}/cpfl/cpfl_rxtx.h | 0 .../{ => intel}/cpfl/cpfl_rxtx_vec_common.h | 0 drivers/net/{ => intel}/cpfl/cpfl_vchnl.c | 0 drivers/net/{ => intel}/cpfl/meson.build | 0 drivers/net/{ => intel}/e1000/base/README | 0 .../e1000/base/e1000_80003es2lan.c | 0 .../e1000/base/e1000_80003es2lan.h | 0 .../net/{ => intel}/e1000/base/e1000_82540.c | 0 .../net/{ => intel}/e1000/base/e1000_82541.c | 0 .../net/{ => intel}/e1000/base/e1000_82541.h | 0 .../net/{ => intel}/e1000/base/e1000_82542.c | 0 .../net/{ => intel}/e1000/base/e1000_82543.c | 0 .../net/{ => intel}/e1000/base/e1000_82543.h | 0 .../net/{ => intel}/e1000/base/e1000_82571.c | 0 .../net/{ => intel}/e1000/base/e1000_82571.h | 0 .../net/{ => intel}/e1000/base/e1000_82575.c | 0 .../net/{ => intel}/e1000/base/e1000_82575.h | 0 .../net/{ => intel}/e1000/base/e1000_api.c | 0 .../net/{ => intel}/e1000/base/e1000_api.h | 0 .../net/{ => intel}/e1000/base/e1000_base.c | 0 .../net/{ => intel}/e1000/base/e1000_base.h | 0 .../{ => intel}/e1000/base/e1000_defines.h | 0 drivers/net/{ => intel}/e1000/base/e1000_hw.h | 0 .../net/{ => intel}/e1000/base/e1000_i210.c | 0 .../net/{ => intel}/e1000/base/e1000_i210.h | 0 .../{ => intel}/e1000/base/e1000_ich8lan.c | 0 .../{ => intel}/e1000/base/e1000_ich8lan.h | 0 .../net/{ => intel}/e1000/base/e1000_mac.c | 0 .../net/{ => intel}/e1000/base/e1000_mac.h | 0 .../net/{ => intel}/e1000/base/e1000_manage.c | 0 .../net/{ => intel}/e1000/base/e1000_manage.h | 0 .../net/{ => intel}/e1000/base/e1000_mbx.c | 0 .../net/{ => intel}/e1000/base/e1000_mbx.h | 0 .../net/{ => intel}/e1000/base/e1000_nvm.c | 0 .../net/{ => intel}/e1000/base/e1000_nvm.h | 0 .../net/{ => intel}/e1000/base/e1000_osdep.c | 0 .../net/{ => intel}/e1000/base/e1000_osdep.h | 0 .../net/{ => intel}/e1000/base/e1000_phy.c | 0 .../net/{ => intel}/e1000/base/e1000_phy.h | 0 .../net/{ => intel}/e1000/base/e1000_regs.h | 0 drivers/net/{ => intel}/e1000/base/e1000_vf.c | 0 drivers/net/{ => intel}/e1000/base/e1000_vf.h | 0 .../net/{ => intel}/e1000/base/meson.build | 0 drivers/net/{ => intel}/e1000/e1000_ethdev.h | 0 drivers/net/{ => intel}/e1000/e1000_logs.c | 0 drivers/net/{ => intel}/e1000/e1000_logs.h | 0 drivers/net/{ => intel}/e1000/em_ethdev.c | 0 drivers/net/{ => intel}/e1000/em_rxtx.c | 0 drivers/net/{ => intel}/e1000/igb_ethdev.c | 0 drivers/net/{ => intel}/e1000/igb_flow.c | 0 drivers/net/{ => intel}/e1000/igb_pf.c | 0 drivers/net/{ => intel}/e1000/igb_regs.h | 0 drivers/net/{ => intel}/e1000/igb_rxtx.c | 0 drivers/net/{ => intel}/e1000/meson.build | 0 .../net/{ => intel}/fm10k/base/fm10k_api.c | 0 .../net/{ => intel}/fm10k/base/fm10k_api.h | 0 .../net/{ => intel}/fm10k/base/fm10k_common.c | 0 .../net/{ => intel}/fm10k/base/fm10k_common.h | 0 .../net/{ => intel}/fm10k/base/fm10k_mbx.c | 0 .../net/{ => intel}/fm10k/base/fm10k_mbx.h | 0 .../net/{ => intel}/fm10k/base/fm10k_osdep.h | 0 drivers/net/{ => intel}/fm10k/base/fm10k_pf.c | 0 drivers/net/{ => intel}/fm10k/base/fm10k_pf.h | 0 .../net/{ => intel}/fm10k/base/fm10k_tlv.c | 0 .../net/{ => intel}/fm10k/base/fm10k_tlv.h | 0 .../net/{ => intel}/fm10k/base/fm10k_type.h | 0 drivers/net/{ => intel}/fm10k/base/fm10k_vf.c | 0 drivers/net/{ => intel}/fm10k/base/fm10k_vf.h | 0 .../net/{ => intel}/fm10k/base/meson.build | 0 drivers/net/{ => intel}/fm10k/fm10k.h | 0 drivers/net/{ => intel}/fm10k/fm10k_ethdev.c | 0 drivers/net/{ => intel}/fm10k/fm10k_logs.h | 0 drivers/net/{ => intel}/fm10k/fm10k_rxtx.c | 0 .../net/{ => intel}/fm10k/fm10k_rxtx_vec.c | 0 drivers/net/{ => intel}/fm10k/meson.build | 0 drivers/net/{ => intel}/i40e/base/README | 0 .../net/{ => intel}/i40e/base/i40e_adminq.c | 0 .../net/{ => intel}/i40e/base/i40e_adminq.h | 0 .../{ => intel}/i40e/base/i40e_adminq_cmd.h | 0 .../net/{ => intel}/i40e/base/i40e_alloc.h | 0 .../net/{ => intel}/i40e/base/i40e_common.c | 0 drivers/net/{ => intel}/i40e/base/i40e_dcb.c | 0 drivers/net/{ => intel}/i40e/base/i40e_dcb.h | 0 .../net/{ => intel}/i40e/base/i40e_devids.h | 0 drivers/net/{ => intel}/i40e/base/i40e_diag.c | 0 drivers/net/{ => intel}/i40e/base/i40e_diag.h | 0 drivers/net/{ => intel}/i40e/base/i40e_hmc.c | 0 drivers/net/{ => intel}/i40e/base/i40e_hmc.h | 0 .../net/{ => intel}/i40e/base/i40e_lan_hmc.c | 0 .../net/{ => intel}/i40e/base/i40e_lan_hmc.h | 0 drivers/net/{ => intel}/i40e/base/i40e_nvm.c | 0 .../net/{ => intel}/i40e/base/i40e_osdep.h | 0 .../{ => intel}/i40e/base/i40e_prototype.h | 0 .../net/{ => intel}/i40e/base/i40e_register.h | 0 .../net/{ => intel}/i40e/base/i40e_status.h | 0 drivers/net/{ => intel}/i40e/base/i40e_type.h | 0 drivers/net/{ => intel}/i40e/base/meson.build | 0 drivers/net/{ => intel}/i40e/base/virtchnl.h | 0 drivers/net/{ => intel}/i40e/i40e_ethdev.c | 0 drivers/net/{ => intel}/i40e/i40e_ethdev.h | 0 drivers/net/{ => intel}/i40e/i40e_fdir.c | 0 drivers/net/{ => intel}/i40e/i40e_flow.c | 0 drivers/net/{ => intel}/i40e/i40e_hash.c | 0 drivers/net/{ => intel}/i40e/i40e_hash.h | 0 drivers/net/{ => intel}/i40e/i40e_logs.h | 0 drivers/net/{ => intel}/i40e/i40e_pf.c | 0 drivers/net/{ => intel}/i40e/i40e_pf.h | 0 .../i40e/i40e_recycle_mbufs_vec_common.c | 0 drivers/net/{ => intel}/i40e/i40e_regs.h | 0 drivers/net/{ => intel}/i40e/i40e_rxtx.c | 0 drivers/net/{ => intel}/i40e/i40e_rxtx.h | 0 .../{ => intel}/i40e/i40e_rxtx_common_avx.h | 0 .../{ => intel}/i40e/i40e_rxtx_vec_altivec.c | 0 .../net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c | 0 .../{ => intel}/i40e/i40e_rxtx_vec_avx512.c | 0 .../{ => intel}/i40e/i40e_rxtx_vec_common.h | 0 .../net/{ => intel}/i40e/i40e_rxtx_vec_neon.c | 0 .../net/{ => intel}/i40e/i40e_rxtx_vec_sse.c | 0 drivers/net/{ => intel}/i40e/i40e_testpmd.c | 0 drivers/net/{ => intel}/i40e/i40e_tm.c | 0 .../{ => intel}/i40e/i40e_vf_representor.c | 0 drivers/net/{ => intel}/i40e/meson.build | 0 drivers/net/{ => intel}/i40e/rte_pmd_i40e.c | 0 drivers/net/{ => intel}/i40e/rte_pmd_i40e.h | 0 drivers/net/{ => intel}/i40e/version.map | 0 drivers/net/{ => intel}/iavf/iavf.h | 0 drivers/net/{ => intel}/iavf/iavf_ethdev.c | 0 drivers/net/{ => intel}/iavf/iavf_fdir.c | 0 drivers/net/{ => intel}/iavf/iavf_fsub.c | 0 .../net/{ => intel}/iavf/iavf_generic_flow.c | 0 .../net/{ => intel}/iavf/iavf_generic_flow.h | 0 drivers/net/{ => intel}/iavf/iavf_hash.c | 0 .../net/{ => intel}/iavf/iavf_ipsec_crypto.c | 0 .../net/{ => intel}/iavf/iavf_ipsec_crypto.h | 0 .../iavf/iavf_ipsec_crypto_capabilities.h | 0 drivers/net/{ => intel}/iavf/iavf_log.h | 0 drivers/net/{ => intel}/iavf/iavf_rxtx.c | 0 drivers/net/{ => intel}/iavf/iavf_rxtx.h | 0 .../net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c | 0 .../{ => intel}/iavf/iavf_rxtx_vec_avx512.c | 0 .../{ => intel}/iavf/iavf_rxtx_vec_common.h | 0 .../net/{ => intel}/iavf/iavf_rxtx_vec_neon.c | 0 .../net/{ => intel}/iavf/iavf_rxtx_vec_sse.c | 0 drivers/net/{ => intel}/iavf/iavf_testpmd.c | 0 drivers/net/{ => intel}/iavf/iavf_tm.c | 0 drivers/net/{ => intel}/iavf/iavf_vchnl.c | 0 drivers/net/{ => intel}/iavf/meson.build | 7 ++----- drivers/net/{ => intel}/iavf/rte_pmd_iavf.h | 0 drivers/net/{ => intel}/iavf/version.map | 0 drivers/net/{ => intel}/ice/base/README | 0 drivers/net/{ => intel}/ice/base/ice_acl.c | 0 drivers/net/{ => intel}/ice/base/ice_acl.h | 0 .../net/{ => intel}/ice/base/ice_acl_ctrl.c | 0 .../net/{ => intel}/ice/base/ice_adminq_cmd.h | 0 drivers/net/{ => intel}/ice/base/ice_alloc.h | 0 drivers/net/{ => intel}/ice/base/ice_bitops.h | 0 .../net/{ => intel}/ice/base/ice_bst_tcam.c | 0 .../net/{ => intel}/ice/base/ice_bst_tcam.h | 0 .../net/{ => intel}/ice/base/ice_cgu_regs.h | 0 drivers/net/{ => intel}/ice/base/ice_common.c | 0 drivers/net/{ => intel}/ice/base/ice_common.h | 0 .../net/{ => intel}/ice/base/ice_controlq.c | 0 .../net/{ => intel}/ice/base/ice_controlq.h | 0 drivers/net/{ => intel}/ice/base/ice_dcb.c | 0 drivers/net/{ => intel}/ice/base/ice_dcb.h | 0 drivers/net/{ => intel}/ice/base/ice_ddp.c | 0 drivers/net/{ => intel}/ice/base/ice_ddp.h | 0 drivers/net/{ => intel}/ice/base/ice_defs.h | 0 drivers/net/{ => intel}/ice/base/ice_devids.h | 0 drivers/net/{ => intel}/ice/base/ice_fdir.c | 0 drivers/net/{ => intel}/ice/base/ice_fdir.h | 0 .../net/{ => intel}/ice/base/ice_flex_pipe.c | 0 .../net/{ => intel}/ice/base/ice_flex_pipe.h | 0 .../net/{ => intel}/ice/base/ice_flex_type.h | 0 drivers/net/{ => intel}/ice/base/ice_flg_rd.c | 0 drivers/net/{ => intel}/ice/base/ice_flg_rd.h | 0 drivers/net/{ => intel}/ice/base/ice_flow.c | 0 drivers/net/{ => intel}/ice/base/ice_flow.h | 0 drivers/net/{ => intel}/ice/base/ice_fwlog.c | 0 drivers/net/{ => intel}/ice/base/ice_fwlog.h | 0 .../net/{ => intel}/ice/base/ice_hw_autogen.h | 0 drivers/net/{ => intel}/ice/base/ice_imem.c | 0 drivers/net/{ => intel}/ice/base/ice_imem.h | 0 .../net/{ => intel}/ice/base/ice_lan_tx_rx.h | 0 .../net/{ => intel}/ice/base/ice_metainit.c | 0 .../net/{ => intel}/ice/base/ice_metainit.h | 0 drivers/net/{ => intel}/ice/base/ice_mk_grp.c | 0 drivers/net/{ => intel}/ice/base/ice_mk_grp.h | 0 drivers/net/{ => intel}/ice/base/ice_nvm.c | 0 drivers/net/{ => intel}/ice/base/ice_nvm.h | 0 drivers/net/{ => intel}/ice/base/ice_osdep.h | 0 drivers/net/{ => intel}/ice/base/ice_parser.c | 0 drivers/net/{ => intel}/ice/base/ice_parser.h | 0 .../net/{ => intel}/ice/base/ice_parser_rt.c | 0 .../net/{ => intel}/ice/base/ice_parser_rt.h | 0 .../{ => intel}/ice/base/ice_parser_util.h | 0 drivers/net/{ => intel}/ice/base/ice_pg_cam.c | 0 drivers/net/{ => intel}/ice/base/ice_pg_cam.h | 0 .../net/{ => intel}/ice/base/ice_phy_regs.h | 0 .../net/{ => intel}/ice/base/ice_proto_grp.c | 0 .../net/{ => intel}/ice/base/ice_proto_grp.h | 0 .../{ => intel}/ice/base/ice_protocol_type.h | 0 .../net/{ => intel}/ice/base/ice_ptp_consts.h | 0 drivers/net/{ => intel}/ice/base/ice_ptp_hw.c | 0 drivers/net/{ => intel}/ice/base/ice_ptp_hw.h | 0 .../net/{ => intel}/ice/base/ice_ptype_mk.c | 0 .../net/{ => intel}/ice/base/ice_ptype_mk.h | 0 .../net/{ => intel}/ice/base/ice_sbq_cmd.h | 0 drivers/net/{ => intel}/ice/base/ice_sched.c | 0 drivers/net/{ => intel}/ice/base/ice_sched.h | 0 drivers/net/{ => intel}/ice/base/ice_status.h | 0 drivers/net/{ => intel}/ice/base/ice_switch.c | 0 drivers/net/{ => intel}/ice/base/ice_switch.h | 0 drivers/net/{ => intel}/ice/base/ice_tmatch.h | 0 drivers/net/{ => intel}/ice/base/ice_type.h | 0 drivers/net/{ => intel}/ice/base/ice_vf_mbx.c | 0 drivers/net/{ => intel}/ice/base/ice_vf_mbx.h | 0 .../net/{ => intel}/ice/base/ice_vlan_mode.c | 0 .../net/{ => intel}/ice/base/ice_vlan_mode.h | 0 drivers/net/{ => intel}/ice/base/ice_xlt_kb.c | 0 drivers/net/{ => intel}/ice/base/ice_xlt_kb.h | 0 drivers/net/{ => intel}/ice/base/meson.build | 0 drivers/net/{ => intel}/ice/ice_acl_filter.c | 0 drivers/net/{ => intel}/ice/ice_dcf.c | 0 drivers/net/{ => intel}/ice/ice_dcf.h | 0 drivers/net/{ => intel}/ice/ice_dcf_ethdev.c | 0 drivers/net/{ => intel}/ice/ice_dcf_ethdev.h | 0 drivers/net/{ => intel}/ice/ice_dcf_parent.c | 0 drivers/net/{ => intel}/ice/ice_dcf_sched.c | 0 .../{ => intel}/ice/ice_dcf_vf_representor.c | 0 drivers/net/{ => intel}/ice/ice_diagnose.c | 0 drivers/net/{ => intel}/ice/ice_ethdev.c | 0 drivers/net/{ => intel}/ice/ice_ethdev.h | 0 drivers/net/{ => intel}/ice/ice_fdir_filter.c | 0 .../net/{ => intel}/ice/ice_generic_flow.c | 0 .../net/{ => intel}/ice/ice_generic_flow.h | 0 drivers/net/{ => intel}/ice/ice_hash.c | 0 drivers/net/{ => intel}/ice/ice_logs.h | 0 drivers/net/{ => intel}/ice/ice_rxtx.c | 0 drivers/net/{ => intel}/ice/ice_rxtx.h | 0 .../net/{ => intel}/ice/ice_rxtx_common_avx.h | 0 .../net/{ => intel}/ice/ice_rxtx_vec_avx2.c | 0 .../net/{ => intel}/ice/ice_rxtx_vec_avx512.c | 0 .../net/{ => intel}/ice/ice_rxtx_vec_common.h | 0 .../net/{ => intel}/ice/ice_rxtx_vec_sse.c | 0 .../net/{ => intel}/ice/ice_switch_filter.c | 0 drivers/net/{ => intel}/ice/ice_testpmd.c | 0 drivers/net/{ => intel}/ice/ice_tm.c | 0 drivers/net/{ => intel}/ice/meson.build | 2 +- drivers/net/{ => intel}/ice/version.map | 0 drivers/net/{ => intel}/idpf/idpf_ethdev.c | 0 drivers/net/{ => intel}/idpf/idpf_ethdev.h | 0 drivers/net/{ => intel}/idpf/idpf_logs.h | 0 drivers/net/{ => intel}/idpf/idpf_rxtx.c | 0 drivers/net/{ => intel}/idpf/idpf_rxtx.h | 0 .../{ => intel}/idpf/idpf_rxtx_vec_common.h | 0 drivers/net/{ => intel}/idpf/meson.build | 0 drivers/net/{ => intel}/igc/base/README | 0 drivers/net/{ => intel}/igc/base/igc_82571.h | 0 drivers/net/{ => intel}/igc/base/igc_82575.h | 0 drivers/net/{ => intel}/igc/base/igc_api.c | 0 drivers/net/{ => intel}/igc/base/igc_api.h | 0 drivers/net/{ => intel}/igc/base/igc_base.c | 0 drivers/net/{ => intel}/igc/base/igc_base.h | 0 .../net/{ => intel}/igc/base/igc_defines.h | 0 drivers/net/{ => intel}/igc/base/igc_hw.h | 0 drivers/net/{ => intel}/igc/base/igc_i225.c | 0 drivers/net/{ => intel}/igc/base/igc_i225.h | 0 .../net/{ => intel}/igc/base/igc_ich8lan.h | 0 drivers/net/{ => intel}/igc/base/igc_mac.c | 0 drivers/net/{ => intel}/igc/base/igc_mac.h | 0 drivers/net/{ => intel}/igc/base/igc_manage.c | 0 drivers/net/{ => intel}/igc/base/igc_manage.h | 0 drivers/net/{ => intel}/igc/base/igc_nvm.c | 0 drivers/net/{ => intel}/igc/base/igc_nvm.h | 0 drivers/net/{ => intel}/igc/base/igc_osdep.c | 0 drivers/net/{ => intel}/igc/base/igc_osdep.h | 0 drivers/net/{ => intel}/igc/base/igc_phy.c | 0 drivers/net/{ => intel}/igc/base/igc_phy.h | 0 drivers/net/{ => intel}/igc/base/igc_regs.h | 0 drivers/net/{ => intel}/igc/base/meson.build | 0 drivers/net/{ => intel}/igc/igc_ethdev.c | 0 drivers/net/{ => intel}/igc/igc_ethdev.h | 0 drivers/net/{ => intel}/igc/igc_filter.c | 0 drivers/net/{ => intel}/igc/igc_filter.h | 0 drivers/net/{ => intel}/igc/igc_flow.c | 0 drivers/net/{ => intel}/igc/igc_flow.h | 0 drivers/net/{ => intel}/igc/igc_logs.c | 0 drivers/net/{ => intel}/igc/igc_logs.h | 0 drivers/net/{ => intel}/igc/igc_txrx.c | 0 drivers/net/{ => intel}/igc/igc_txrx.h | 0 drivers/net/{ => intel}/igc/meson.build | 0 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.c | 0 .../net/{ => intel}/ipn3ke/ipn3ke_ethdev.h | 0 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c | 0 drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h | 0 drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h | 0 .../{ => intel}/ipn3ke/ipn3ke_rawdev_api.h | 0 .../{ => intel}/ipn3ke/ipn3ke_representor.c | 0 drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c | 0 drivers/net/{ => intel}/ipn3ke/meson.build | 2 +- drivers/net/{ => intel}/ipn3ke/version.map | 0 drivers/net/{ => intel}/ixgbe/base/README | 0 .../net/{ => intel}/ixgbe/base/ixgbe_82598.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_82598.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_82599.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_82599.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_api.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_api.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_common.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_common.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_dcb.h | 0 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.c | 0 .../{ => intel}/ixgbe/base/ixgbe_dcb_82598.h | 0 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.c | 0 .../{ => intel}/ixgbe/base/ixgbe_dcb_82599.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_e610.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_e610.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_mbx.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_osdep.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_phy.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_phy.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_type.h | 0 .../{ => intel}/ixgbe/base/ixgbe_type_e610.h | 0 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c | 0 drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_x540.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_x540.h | 0 .../net/{ => intel}/ixgbe/base/ixgbe_x550.c | 0 .../net/{ => intel}/ixgbe/base/ixgbe_x550.h | 0 .../net/{ => intel}/ixgbe/base/meson.build | 0 .../{ => intel}/ixgbe/ixgbe_82599_bypass.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h | 0 .../net/{ => intel}/ixgbe/ixgbe_bypass_api.h | 0 .../{ => intel}/ixgbe/ixgbe_bypass_defines.h | 0 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h | 0 drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_flow.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h | 0 drivers/net/{ => intel}/ixgbe/ixgbe_logs.h | 0 drivers/net/{ => intel}/ixgbe/ixgbe_pf.c | 0 .../ixgbe/ixgbe_recycle_mbufs_vec_common.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_regs.h | 0 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h | 0 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_common.h | 0 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c | 0 .../{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c | 0 drivers/net/{ => intel}/ixgbe/ixgbe_tm.c | 0 .../{ => intel}/ixgbe/ixgbe_vf_representor.c | 0 drivers/net/{ => intel}/ixgbe/meson.build | 0 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c | 0 drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h | 0 drivers/net/{ => intel}/ixgbe/version.map | 0 drivers/net/meson.build | 20 +++++++++---------- drivers/raw/ifpga/meson.build | 2 -- usertools/dpdk-rss-flows.py | 4 ++-- 389 files changed, 38 insertions(+), 35 deletions(-) rename drivers/net/{ => intel}/cpfl/cpfl_actions.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_controlq.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_controlq.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_cpchnl.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_ethdev.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_flow.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_flow.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_flow_engine_fxp.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_flow_parser.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_fxp_rule.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_logs.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_representor.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_representor.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_rules.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_rules.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.c (100%) rename drivers/net/{ => intel}/cpfl/cpfl_rxtx.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_rxtx_vec_common.h (100%) rename drivers/net/{ => intel}/cpfl/cpfl_vchnl.c (100%) rename drivers/net/{ => intel}/cpfl/meson.build (100%) rename drivers/net/{ => intel}/e1000/base/README (100%) rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_80003es2lan.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82540.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82541.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82541.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82542.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82543.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82543.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82571.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82571.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82575.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_82575.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_api.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_api.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_base.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_base.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_defines.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_hw.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_i210.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_i210.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_ich8lan.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_mac.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_mac.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_manage.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_manage.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_mbx.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_mbx.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_nvm.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_nvm.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_osdep.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_osdep.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_phy.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_phy.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_regs.h (100%) rename drivers/net/{ => intel}/e1000/base/e1000_vf.c (100%) rename drivers/net/{ => intel}/e1000/base/e1000_vf.h (100%) rename drivers/net/{ => intel}/e1000/base/meson.build (100%) rename drivers/net/{ => intel}/e1000/e1000_ethdev.h (100%) rename drivers/net/{ => intel}/e1000/e1000_logs.c (100%) rename drivers/net/{ => intel}/e1000/e1000_logs.h (100%) rename drivers/net/{ => intel}/e1000/em_ethdev.c (100%) rename drivers/net/{ => intel}/e1000/em_rxtx.c (100%) rename drivers/net/{ => intel}/e1000/igb_ethdev.c (100%) rename drivers/net/{ => intel}/e1000/igb_flow.c (100%) rename drivers/net/{ => intel}/e1000/igb_pf.c (100%) rename drivers/net/{ => intel}/e1000/igb_regs.h (100%) rename drivers/net/{ => intel}/e1000/igb_rxtx.c (100%) rename drivers/net/{ => intel}/e1000/meson.build (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_api.c (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_api.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_common.c (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_common.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.c (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_mbx.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_osdep.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.c (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_pf.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.c (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_tlv.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_type.h (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.c (100%) rename drivers/net/{ => intel}/fm10k/base/fm10k_vf.h (100%) rename drivers/net/{ => intel}/fm10k/base/meson.build (100%) rename drivers/net/{ => intel}/fm10k/fm10k.h (100%) rename drivers/net/{ => intel}/fm10k/fm10k_ethdev.c (100%) rename drivers/net/{ => intel}/fm10k/fm10k_logs.h (100%) rename drivers/net/{ => intel}/fm10k/fm10k_rxtx.c (100%) rename drivers/net/{ => intel}/fm10k/fm10k_rxtx_vec.c (100%) rename drivers/net/{ => intel}/fm10k/meson.build (100%) rename drivers/net/{ => intel}/i40e/base/README (100%) rename drivers/net/{ => intel}/i40e/base/i40e_adminq.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_adminq.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_adminq_cmd.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_alloc.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_common.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_dcb.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_dcb.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_devids.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_diag.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_diag.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_hmc.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_hmc.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_lan_hmc.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_nvm.c (100%) rename drivers/net/{ => intel}/i40e/base/i40e_osdep.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_prototype.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_register.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_status.h (100%) rename drivers/net/{ => intel}/i40e/base/i40e_type.h (100%) rename drivers/net/{ => intel}/i40e/base/meson.build (100%) rename drivers/net/{ => intel}/i40e/base/virtchnl.h (100%) rename drivers/net/{ => intel}/i40e/i40e_ethdev.c (100%) rename drivers/net/{ => intel}/i40e/i40e_ethdev.h (100%) rename drivers/net/{ => intel}/i40e/i40e_fdir.c (100%) rename drivers/net/{ => intel}/i40e/i40e_flow.c (100%) rename drivers/net/{ => intel}/i40e/i40e_hash.c (100%) rename drivers/net/{ => intel}/i40e/i40e_hash.h (100%) rename drivers/net/{ => intel}/i40e/i40e_logs.h (100%) rename drivers/net/{ => intel}/i40e/i40e_pf.c (100%) rename drivers/net/{ => intel}/i40e/i40e_pf.h (100%) rename drivers/net/{ => intel}/i40e/i40e_recycle_mbufs_vec_common.c (100%) rename drivers/net/{ => intel}/i40e/i40e_regs.h (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx.c (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx.h (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_common_avx.h (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_altivec.c (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx2.c (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_avx512.c (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_common.h (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_neon.c (100%) rename drivers/net/{ => intel}/i40e/i40e_rxtx_vec_sse.c (100%) rename drivers/net/{ => intel}/i40e/i40e_testpmd.c (100%) rename drivers/net/{ => intel}/i40e/i40e_tm.c (100%) rename drivers/net/{ => intel}/i40e/i40e_vf_representor.c (100%) rename drivers/net/{ => intel}/i40e/meson.build (100%) rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.c (100%) rename drivers/net/{ => intel}/i40e/rte_pmd_i40e.h (100%) rename drivers/net/{ => intel}/i40e/version.map (100%) rename drivers/net/{ => intel}/iavf/iavf.h (100%) rename drivers/net/{ => intel}/iavf/iavf_ethdev.c (100%) rename drivers/net/{ => intel}/iavf/iavf_fdir.c (100%) rename drivers/net/{ => intel}/iavf/iavf_fsub.c (100%) rename drivers/net/{ => intel}/iavf/iavf_generic_flow.c (100%) rename drivers/net/{ => intel}/iavf/iavf_generic_flow.h (100%) rename drivers/net/{ => intel}/iavf/iavf_hash.c (100%) rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.c (100%) rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto.h (100%) rename drivers/net/{ => intel}/iavf/iavf_ipsec_crypto_capabilities.h (100%) rename drivers/net/{ => intel}/iavf/iavf_log.h (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx.c (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx.h (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx2.c (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_avx512.c (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_common.h (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_neon.c (100%) rename drivers/net/{ => intel}/iavf/iavf_rxtx_vec_sse.c (100%) rename drivers/net/{ => intel}/iavf/iavf_testpmd.c (100%) rename drivers/net/{ => intel}/iavf/iavf_tm.c (100%) rename drivers/net/{ => intel}/iavf/iavf_vchnl.c (100%) rename drivers/net/{ => intel}/iavf/meson.build (86%) rename drivers/net/{ => intel}/iavf/rte_pmd_iavf.h (100%) rename drivers/net/{ => intel}/iavf/version.map (100%) rename drivers/net/{ => intel}/ice/base/README (100%) rename drivers/net/{ => intel}/ice/base/ice_acl.c (100%) rename drivers/net/{ => intel}/ice/base/ice_acl.h (100%) rename drivers/net/{ => intel}/ice/base/ice_acl_ctrl.c (100%) rename drivers/net/{ => intel}/ice/base/ice_adminq_cmd.h (100%) rename drivers/net/{ => intel}/ice/base/ice_alloc.h (100%) rename drivers/net/{ => intel}/ice/base/ice_bitops.h (100%) rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.c (100%) rename drivers/net/{ => intel}/ice/base/ice_bst_tcam.h (100%) rename drivers/net/{ => intel}/ice/base/ice_cgu_regs.h (100%) rename drivers/net/{ => intel}/ice/base/ice_common.c (100%) rename drivers/net/{ => intel}/ice/base/ice_common.h (100%) rename drivers/net/{ => intel}/ice/base/ice_controlq.c (100%) rename drivers/net/{ => intel}/ice/base/ice_controlq.h (100%) rename drivers/net/{ => intel}/ice/base/ice_dcb.c (100%) rename drivers/net/{ => intel}/ice/base/ice_dcb.h (100%) rename drivers/net/{ => intel}/ice/base/ice_ddp.c (100%) rename drivers/net/{ => intel}/ice/base/ice_ddp.h (100%) rename drivers/net/{ => intel}/ice/base/ice_defs.h (100%) rename drivers/net/{ => intel}/ice/base/ice_devids.h (100%) rename drivers/net/{ => intel}/ice/base/ice_fdir.c (100%) rename drivers/net/{ => intel}/ice/base/ice_fdir.h (100%) rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.c (100%) rename drivers/net/{ => intel}/ice/base/ice_flex_pipe.h (100%) rename drivers/net/{ => intel}/ice/base/ice_flex_type.h (100%) rename drivers/net/{ => intel}/ice/base/ice_flg_rd.c (100%) rename drivers/net/{ => intel}/ice/base/ice_flg_rd.h (100%) rename drivers/net/{ => intel}/ice/base/ice_flow.c (100%) rename drivers/net/{ => intel}/ice/base/ice_flow.h (100%) rename drivers/net/{ => intel}/ice/base/ice_fwlog.c (100%) rename drivers/net/{ => intel}/ice/base/ice_fwlog.h (100%) rename drivers/net/{ => intel}/ice/base/ice_hw_autogen.h (100%) rename drivers/net/{ => intel}/ice/base/ice_imem.c (100%) rename drivers/net/{ => intel}/ice/base/ice_imem.h (100%) rename drivers/net/{ => intel}/ice/base/ice_lan_tx_rx.h (100%) rename drivers/net/{ => intel}/ice/base/ice_metainit.c (100%) rename drivers/net/{ => intel}/ice/base/ice_metainit.h (100%) rename drivers/net/{ => intel}/ice/base/ice_mk_grp.c (100%) rename drivers/net/{ => intel}/ice/base/ice_mk_grp.h (100%) rename drivers/net/{ => intel}/ice/base/ice_nvm.c (100%) rename drivers/net/{ => intel}/ice/base/ice_nvm.h (100%) rename drivers/net/{ => intel}/ice/base/ice_osdep.h (100%) rename drivers/net/{ => intel}/ice/base/ice_parser.c (100%) rename drivers/net/{ => intel}/ice/base/ice_parser.h (100%) rename drivers/net/{ => intel}/ice/base/ice_parser_rt.c (100%) rename drivers/net/{ => intel}/ice/base/ice_parser_rt.h (100%) rename drivers/net/{ => intel}/ice/base/ice_parser_util.h (100%) rename drivers/net/{ => intel}/ice/base/ice_pg_cam.c (100%) rename drivers/net/{ => intel}/ice/base/ice_pg_cam.h (100%) rename drivers/net/{ => intel}/ice/base/ice_phy_regs.h (100%) rename drivers/net/{ => intel}/ice/base/ice_proto_grp.c (100%) rename drivers/net/{ => intel}/ice/base/ice_proto_grp.h (100%) rename drivers/net/{ => intel}/ice/base/ice_protocol_type.h (100%) rename drivers/net/{ => intel}/ice/base/ice_ptp_consts.h (100%) rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.c (100%) rename drivers/net/{ => intel}/ice/base/ice_ptp_hw.h (100%) rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.c (100%) rename drivers/net/{ => intel}/ice/base/ice_ptype_mk.h (100%) rename drivers/net/{ => intel}/ice/base/ice_sbq_cmd.h (100%) rename drivers/net/{ => intel}/ice/base/ice_sched.c (100%) rename drivers/net/{ => intel}/ice/base/ice_sched.h (100%) rename drivers/net/{ => intel}/ice/base/ice_status.h (100%) rename drivers/net/{ => intel}/ice/base/ice_switch.c (100%) rename drivers/net/{ => intel}/ice/base/ice_switch.h (100%) rename drivers/net/{ => intel}/ice/base/ice_tmatch.h (100%) rename drivers/net/{ => intel}/ice/base/ice_type.h (100%) rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.c (100%) rename drivers/net/{ => intel}/ice/base/ice_vf_mbx.h (100%) rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.c (100%) rename drivers/net/{ => intel}/ice/base/ice_vlan_mode.h (100%) rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.c (100%) rename drivers/net/{ => intel}/ice/base/ice_xlt_kb.h (100%) rename drivers/net/{ => intel}/ice/base/meson.build (100%) rename drivers/net/{ => intel}/ice/ice_acl_filter.c (100%) rename drivers/net/{ => intel}/ice/ice_dcf.c (100%) rename drivers/net/{ => intel}/ice/ice_dcf.h (100%) rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.c (100%) rename drivers/net/{ => intel}/ice/ice_dcf_ethdev.h (100%) rename drivers/net/{ => intel}/ice/ice_dcf_parent.c (100%) rename drivers/net/{ => intel}/ice/ice_dcf_sched.c (100%) rename drivers/net/{ => intel}/ice/ice_dcf_vf_representor.c (100%) rename drivers/net/{ => intel}/ice/ice_diagnose.c (100%) rename drivers/net/{ => intel}/ice/ice_ethdev.c (100%) rename drivers/net/{ => intel}/ice/ice_ethdev.h (100%) rename drivers/net/{ => intel}/ice/ice_fdir_filter.c (100%) rename drivers/net/{ => intel}/ice/ice_generic_flow.c (100%) rename drivers/net/{ => intel}/ice/ice_generic_flow.h (100%) rename drivers/net/{ => intel}/ice/ice_hash.c (100%) rename drivers/net/{ => intel}/ice/ice_logs.h (100%) rename drivers/net/{ => intel}/ice/ice_rxtx.c (100%) rename drivers/net/{ => intel}/ice/ice_rxtx.h (100%) rename drivers/net/{ => intel}/ice/ice_rxtx_common_avx.h (100%) rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx2.c (100%) rename drivers/net/{ => intel}/ice/ice_rxtx_vec_avx512.c (100%) rename drivers/net/{ => intel}/ice/ice_rxtx_vec_common.h (100%) rename drivers/net/{ => intel}/ice/ice_rxtx_vec_sse.c (100%) rename drivers/net/{ => intel}/ice/ice_switch_filter.c (100%) rename drivers/net/{ => intel}/ice/ice_testpmd.c (100%) rename drivers/net/{ => intel}/ice/ice_tm.c (100%) rename drivers/net/{ => intel}/ice/meson.build (96%) rename drivers/net/{ => intel}/ice/version.map (100%) rename drivers/net/{ => intel}/idpf/idpf_ethdev.c (100%) rename drivers/net/{ => intel}/idpf/idpf_ethdev.h (100%) rename drivers/net/{ => intel}/idpf/idpf_logs.h (100%) rename drivers/net/{ => intel}/idpf/idpf_rxtx.c (100%) rename drivers/net/{ => intel}/idpf/idpf_rxtx.h (100%) rename drivers/net/{ => intel}/idpf/idpf_rxtx_vec_common.h (100%) rename drivers/net/{ => intel}/idpf/meson.build (100%) rename drivers/net/{ => intel}/igc/base/README (100%) rename drivers/net/{ => intel}/igc/base/igc_82571.h (100%) rename drivers/net/{ => intel}/igc/base/igc_82575.h (100%) rename drivers/net/{ => intel}/igc/base/igc_api.c (100%) rename drivers/net/{ => intel}/igc/base/igc_api.h (100%) rename drivers/net/{ => intel}/igc/base/igc_base.c (100%) rename drivers/net/{ => intel}/igc/base/igc_base.h (100%) rename drivers/net/{ => intel}/igc/base/igc_defines.h (100%) rename drivers/net/{ => intel}/igc/base/igc_hw.h (100%) rename drivers/net/{ => intel}/igc/base/igc_i225.c (100%) rename drivers/net/{ => intel}/igc/base/igc_i225.h (100%) rename drivers/net/{ => intel}/igc/base/igc_ich8lan.h (100%) rename drivers/net/{ => intel}/igc/base/igc_mac.c (100%) rename drivers/net/{ => intel}/igc/base/igc_mac.h (100%) rename drivers/net/{ => intel}/igc/base/igc_manage.c (100%) rename drivers/net/{ => intel}/igc/base/igc_manage.h (100%) rename drivers/net/{ => intel}/igc/base/igc_nvm.c (100%) rename drivers/net/{ => intel}/igc/base/igc_nvm.h (100%) rename drivers/net/{ => intel}/igc/base/igc_osdep.c (100%) rename drivers/net/{ => intel}/igc/base/igc_osdep.h (100%) rename drivers/net/{ => intel}/igc/base/igc_phy.c (100%) rename drivers/net/{ => intel}/igc/base/igc_phy.h (100%) rename drivers/net/{ => intel}/igc/base/igc_regs.h (100%) rename drivers/net/{ => intel}/igc/base/meson.build (100%) rename drivers/net/{ => intel}/igc/igc_ethdev.c (100%) rename drivers/net/{ => intel}/igc/igc_ethdev.h (100%) rename drivers/net/{ => intel}/igc/igc_filter.c (100%) rename drivers/net/{ => intel}/igc/igc_filter.h (100%) rename drivers/net/{ => intel}/igc/igc_flow.c (100%) rename drivers/net/{ => intel}/igc/igc_flow.h (100%) rename drivers/net/{ => intel}/igc/igc_logs.c (100%) rename drivers/net/{ => intel}/igc/igc_logs.h (100%) rename drivers/net/{ => intel}/igc/igc_txrx.c (100%) rename drivers/net/{ => intel}/igc/igc_txrx.h (100%) rename drivers/net/{ => intel}/igc/meson.build (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.c (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_ethdev.h (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.c (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_flow.h (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_logs.h (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_rawdev_api.h (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_representor.c (100%) rename drivers/net/{ => intel}/ipn3ke/ipn3ke_tm.c (100%) rename drivers/net/{ => intel}/ipn3ke/meson.build (91%) rename drivers/net/{ => intel}/ipn3ke/version.map (100%) rename drivers/net/{ => intel}/ixgbe/base/README (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82598.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_82599.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_api.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_common.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82598.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_dcb_82599.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_e610.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_hv_vf.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_mbx.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_osdep.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_phy.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_type_e610.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_vf.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x540.h (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.c (100%) rename drivers/net/{ => intel}/ixgbe/base/ixgbe_x550.h (100%) rename drivers/net/{ => intel}/ixgbe/base/meson.build (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_82599_bypass.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_api.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_bypass_defines.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_ethdev.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_fdir.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_flow.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_ipsec.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_logs.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_pf.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_recycle_mbufs_vec_common.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_regs.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_common.h (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_neon.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_rxtx_vec_sse.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_testpmd.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_tm.c (100%) rename drivers/net/{ => intel}/ixgbe/ixgbe_vf_representor.c (100%) rename drivers/net/{ => intel}/ixgbe/meson.build (100%) rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.c (100%) rename drivers/net/{ => intel}/ixgbe/rte_pmd_ixgbe.h (100%) rename drivers/net/{ => intel}/ixgbe/version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b86cdd266b..5f23ee558c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -779,7 +779,7 @@ F: doc/guides/nics/features/hinic.ini Intel e1000 T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/e1000/ +F: drivers/net/intel/e1000/ F: doc/guides/nics/e1000em.rst F: doc/guides/nics/intel_vf.rst F: doc/guides/nics/features/e1000.ini @@ -789,7 +789,7 @@ Intel ixgbe M: Anatoly Burakov M: Vladimir Medvedkin T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/ixgbe/ +F: drivers/net/intel/ixgbe/ F: doc/guides/nics/ixgbe.rst F: doc/guides/nics/intel_vf.rst F: doc/guides/nics/features/ixgbe*.ini @@ -798,14 +798,14 @@ Intel i40e M: Ian Stokes M: Bruce Richardson T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/i40e/ +F: drivers/net/intel/i40e/ F: doc/guides/nics/i40e.rst F: doc/guides/nics/intel_vf.rst F: doc/guides/nics/features/i40e*.ini Intel fm10k T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/fm10k/ +F: drivers/net/intel/fm10k/ F: doc/guides/nics/fm10k.rst F: doc/guides/nics/features/fm10k*.ini @@ -813,7 +813,7 @@ Intel iavf M: Vladimir Medvedkin M: Ian Stokes T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/iavf/ +F: drivers/net/intel/iavf/ F: drivers/common/iavf/ F: doc/guides/nics/features/iavf*.ini @@ -821,7 +821,7 @@ Intel ice M: Bruce Richardson M: Anatoly Burakov T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/ice/ +F: drivers/net/intel/ice/ F: doc/guides/nics/ice.rst F: doc/guides/nics/features/ice.ini @@ -829,7 +829,7 @@ Intel idpf M: Jingjing Wu M: Praveen Shetty T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/idpf/ +F: drivers/net/intel/idpf/ F: drivers/common/idpf/ F: doc/guides/nics/idpf.rst F: doc/guides/nics/features/idpf.ini @@ -837,20 +837,20 @@ F: doc/guides/nics/features/idpf.ini Intel cpfl - EXPERIMENTAL M: Praveen Shetty T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/cpfl/ +F: drivers/net/intel/cpfl/ F: doc/guides/nics/cpfl.rst F: doc/guides/nics/features/cpfl.ini Intel igc T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/igc/ +F: drivers/net/intel/igc/ F: doc/guides/nics/igc.rst F: doc/guides/nics/features/igc.ini Intel ipn3ke M: Rosen Xu T: git://dpdk.org/next/dpdk-next-net-intel -F: drivers/net/ipn3ke/ +F: drivers/net/intel/ipn3ke/ F: doc/guides/nics/ipn3ke.rst F: doc/guides/nics/features/ipn3ke.ini diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh index 2ee7f2db64..b2da013f6c 100755 --- a/devtools/check-git-log.sh +++ b/devtools/check-git-log.sh @@ -79,6 +79,10 @@ bad=$(for commit in $commits ; do [ -z "$(echo "$files" | grep -v '^\(drivers\|doc\|config\)/')" ] || continue drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,3 | sort -u) + # for drivers/net/intel/* use 2nd and 4th fields not 2nd and 3rd + if [ "$drv" = "net/intel" ] ; then + drv=$(echo "$files" | grep '^drivers/' | cut -d "/" -f 2,4 | sort -u) + fi drvgrp=$(echo "$drv" | cut -d "/" -f 1 | uniq) if [ $(echo "$drvgrp" | wc -l) -gt 1 ] ; then echo "$headline" | grep -v '^drivers:' diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index d23352d300..ebe9c211a9 100644 --- a/doc/api/doxy-api.conf.in +++ b/doc/api/doxy-api.conf.in @@ -19,9 +19,9 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \ @TOPDIR@/drivers/net/cnxk \ @TOPDIR@/drivers/net/dpaa \ @TOPDIR@/drivers/net/dpaa2 \ - @TOPDIR@/drivers/net/i40e \ - @TOPDIR@/drivers/net/iavf \ - @TOPDIR@/drivers/net/ixgbe \ + @TOPDIR@/drivers/net/intel/i40e \ + @TOPDIR@/drivers/net/intel/iavf \ + @TOPDIR@/drivers/net/intel/ixgbe \ @TOPDIR@/drivers/net/mlx5 \ @TOPDIR@/drivers/net/softnic \ @TOPDIR@/drivers/raw/dpaa2_cmdif \ diff --git a/drivers/meson.build b/drivers/meson.build index 495e21b54a..89545e618e 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -47,7 +47,7 @@ enable_drivers = run_command(list_dir_globs, enable_drivers, check: true).stdout require_drivers = true if enable_drivers.length() == 0 require_drivers = false - enable_drivers = run_command(list_dir_globs, '*/*', check: true).stdout().split() + enable_drivers = run_command(list_dir_globs, '*/*,*/*/*', check: true).stdout().split() endif # these drivers must always be enabled, otherwise the build breaks @@ -143,6 +143,10 @@ foreach subpath:subdirs testpmd_sources = [] require_iova_in_mbuf = true + if name.contains('/') + name = name.split('/')[1] + endif + if not enable_drivers.contains(drv_path) build = false reason = 'not in enabled drivers build config' diff --git a/drivers/net/cpfl/cpfl_actions.h b/drivers/net/intel/cpfl/cpfl_actions.h similarity index 100% rename from drivers/net/cpfl/cpfl_actions.h rename to drivers/net/intel/cpfl/cpfl_actions.h diff --git a/drivers/net/cpfl/cpfl_controlq.c b/drivers/net/intel/cpfl/cpfl_controlq.c similarity index 100% rename from drivers/net/cpfl/cpfl_controlq.c rename to drivers/net/intel/cpfl/cpfl_controlq.c diff --git a/drivers/net/cpfl/cpfl_controlq.h b/drivers/net/intel/cpfl/cpfl_controlq.h similarity index 100% rename from drivers/net/cpfl/cpfl_controlq.h rename to drivers/net/intel/cpfl/cpfl_controlq.h diff --git a/drivers/net/cpfl/cpfl_cpchnl.h b/drivers/net/intel/cpfl/cpfl_cpchnl.h similarity index 100% rename from drivers/net/cpfl/cpfl_cpchnl.h rename to drivers/net/intel/cpfl/cpfl_cpchnl.h diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/intel/cpfl/cpfl_ethdev.c similarity index 100% rename from drivers/net/cpfl/cpfl_ethdev.c rename to drivers/net/intel/cpfl/cpfl_ethdev.c diff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/intel/cpfl/cpfl_ethdev.h similarity index 100% rename from drivers/net/cpfl/cpfl_ethdev.h rename to drivers/net/intel/cpfl/cpfl_ethdev.h diff --git a/drivers/net/cpfl/cpfl_flow.c b/drivers/net/intel/cpfl/cpfl_flow.c similarity index 100% rename from drivers/net/cpfl/cpfl_flow.c rename to drivers/net/intel/cpfl/cpfl_flow.c diff --git a/drivers/net/cpfl/cpfl_flow.h b/drivers/net/intel/cpfl/cpfl_flow.h similarity index 100% rename from drivers/net/cpfl/cpfl_flow.h rename to drivers/net/intel/cpfl/cpfl_flow.h diff --git a/drivers/net/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c similarity index 100% rename from drivers/net/cpfl/cpfl_flow_engine_fxp.c rename to drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c diff --git a/drivers/net/cpfl/cpfl_flow_parser.c b/drivers/net/intel/cpfl/cpfl_flow_parser.c similarity index 100% rename from drivers/net/cpfl/cpfl_flow_parser.c rename to drivers/net/intel/cpfl/cpfl_flow_parser.c diff --git a/drivers/net/cpfl/cpfl_flow_parser.h b/drivers/net/intel/cpfl/cpfl_flow_parser.h similarity index 100% rename from drivers/net/cpfl/cpfl_flow_parser.h rename to drivers/net/intel/cpfl/cpfl_flow_parser.h diff --git a/drivers/net/cpfl/cpfl_fxp_rule.c b/drivers/net/intel/cpfl/cpfl_fxp_rule.c similarity index 100% rename from drivers/net/cpfl/cpfl_fxp_rule.c rename to drivers/net/intel/cpfl/cpfl_fxp_rule.c diff --git a/drivers/net/cpfl/cpfl_fxp_rule.h b/drivers/net/intel/cpfl/cpfl_fxp_rule.h similarity index 100% rename from drivers/net/cpfl/cpfl_fxp_rule.h rename to drivers/net/intel/cpfl/cpfl_fxp_rule.h diff --git a/drivers/net/cpfl/cpfl_logs.h b/drivers/net/intel/cpfl/cpfl_logs.h similarity index 100% rename from drivers/net/cpfl/cpfl_logs.h rename to drivers/net/intel/cpfl/cpfl_logs.h diff --git a/drivers/net/cpfl/cpfl_representor.c b/drivers/net/intel/cpfl/cpfl_representor.c similarity index 100% rename from drivers/net/cpfl/cpfl_representor.c rename to drivers/net/intel/cpfl/cpfl_representor.c diff --git a/drivers/net/cpfl/cpfl_representor.h b/drivers/net/intel/cpfl/cpfl_representor.h similarity index 100% rename from drivers/net/cpfl/cpfl_representor.h rename to drivers/net/intel/cpfl/cpfl_representor.h diff --git a/drivers/net/cpfl/cpfl_rules.c b/drivers/net/intel/cpfl/cpfl_rules.c similarity index 100% rename from drivers/net/cpfl/cpfl_rules.c rename to drivers/net/intel/cpfl/cpfl_rules.c diff --git a/drivers/net/cpfl/cpfl_rules.h b/drivers/net/intel/cpfl/cpfl_rules.h similarity index 100% rename from drivers/net/cpfl/cpfl_rules.h rename to drivers/net/intel/cpfl/cpfl_rules.h diff --git a/drivers/net/cpfl/cpfl_rxtx.c b/drivers/net/intel/cpfl/cpfl_rxtx.c similarity index 100% rename from drivers/net/cpfl/cpfl_rxtx.c rename to drivers/net/intel/cpfl/cpfl_rxtx.c diff --git a/drivers/net/cpfl/cpfl_rxtx.h b/drivers/net/intel/cpfl/cpfl_rxtx.h similarity index 100% rename from drivers/net/cpfl/cpfl_rxtx.h rename to drivers/net/intel/cpfl/cpfl_rxtx.h diff --git a/drivers/net/cpfl/cpfl_rxtx_vec_common.h b/drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h similarity index 100% rename from drivers/net/cpfl/cpfl_rxtx_vec_common.h rename to drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h diff --git a/drivers/net/cpfl/cpfl_vchnl.c b/drivers/net/intel/cpfl/cpfl_vchnl.c similarity index 100% rename from drivers/net/cpfl/cpfl_vchnl.c rename to drivers/net/intel/cpfl/cpfl_vchnl.c diff --git a/drivers/net/cpfl/meson.build b/drivers/net/intel/cpfl/meson.build similarity index 100% rename from drivers/net/cpfl/meson.build rename to drivers/net/intel/cpfl/meson.build diff --git a/drivers/net/e1000/base/README b/drivers/net/intel/e1000/base/README similarity index 100% rename from drivers/net/e1000/base/README rename to drivers/net/intel/e1000/base/README diff --git a/drivers/net/e1000/base/e1000_80003es2lan.c b/drivers/net/intel/e1000/base/e1000_80003es2lan.c similarity index 100% rename from drivers/net/e1000/base/e1000_80003es2lan.c rename to drivers/net/intel/e1000/base/e1000_80003es2lan.c diff --git a/drivers/net/e1000/base/e1000_80003es2lan.h b/drivers/net/intel/e1000/base/e1000_80003es2lan.h similarity index 100% rename from drivers/net/e1000/base/e1000_80003es2lan.h rename to drivers/net/intel/e1000/base/e1000_80003es2lan.h diff --git a/drivers/net/e1000/base/e1000_82540.c b/drivers/net/intel/e1000/base/e1000_82540.c similarity index 100% rename from drivers/net/e1000/base/e1000_82540.c rename to drivers/net/intel/e1000/base/e1000_82540.c diff --git a/drivers/net/e1000/base/e1000_82541.c b/drivers/net/intel/e1000/base/e1000_82541.c similarity index 100% rename from drivers/net/e1000/base/e1000_82541.c rename to drivers/net/intel/e1000/base/e1000_82541.c diff --git a/drivers/net/e1000/base/e1000_82541.h b/drivers/net/intel/e1000/base/e1000_82541.h similarity index 100% rename from drivers/net/e1000/base/e1000_82541.h rename to drivers/net/intel/e1000/base/e1000_82541.h diff --git a/drivers/net/e1000/base/e1000_82542.c b/drivers/net/intel/e1000/base/e1000_82542.c similarity index 100% rename from drivers/net/e1000/base/e1000_82542.c rename to drivers/net/intel/e1000/base/e1000_82542.c diff --git a/drivers/net/e1000/base/e1000_82543.c b/drivers/net/intel/e1000/base/e1000_82543.c similarity index 100% rename from drivers/net/e1000/base/e1000_82543.c rename to drivers/net/intel/e1000/base/e1000_82543.c diff --git a/drivers/net/e1000/base/e1000_82543.h b/drivers/net/intel/e1000/base/e1000_82543.h similarity index 100% rename from drivers/net/e1000/base/e1000_82543.h rename to drivers/net/intel/e1000/base/e1000_82543.h diff --git a/drivers/net/e1000/base/e1000_82571.c b/drivers/net/intel/e1000/base/e1000_82571.c similarity index 100% rename from drivers/net/e1000/base/e1000_82571.c rename to drivers/net/intel/e1000/base/e1000_82571.c diff --git a/drivers/net/e1000/base/e1000_82571.h b/drivers/net/intel/e1000/base/e1000_82571.h similarity index 100% rename from drivers/net/e1000/base/e1000_82571.h rename to drivers/net/intel/e1000/base/e1000_82571.h diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/intel/e1000/base/e1000_82575.c similarity index 100% rename from drivers/net/e1000/base/e1000_82575.c rename to drivers/net/intel/e1000/base/e1000_82575.c diff --git a/drivers/net/e1000/base/e1000_82575.h b/drivers/net/intel/e1000/base/e1000_82575.h similarity index 100% rename from drivers/net/e1000/base/e1000_82575.h rename to drivers/net/intel/e1000/base/e1000_82575.h diff --git a/drivers/net/e1000/base/e1000_api.c b/drivers/net/intel/e1000/base/e1000_api.c similarity index 100% rename from drivers/net/e1000/base/e1000_api.c rename to drivers/net/intel/e1000/base/e1000_api.c diff --git a/drivers/net/e1000/base/e1000_api.h b/drivers/net/intel/e1000/base/e1000_api.h similarity index 100% rename from drivers/net/e1000/base/e1000_api.h rename to drivers/net/intel/e1000/base/e1000_api.h diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/intel/e1000/base/e1000_base.c similarity index 100% rename from drivers/net/e1000/base/e1000_base.c rename to drivers/net/intel/e1000/base/e1000_base.c diff --git a/drivers/net/e1000/base/e1000_base.h b/drivers/net/intel/e1000/base/e1000_base.h similarity index 100% rename from drivers/net/e1000/base/e1000_base.h rename to drivers/net/intel/e1000/base/e1000_base.h diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/intel/e1000/base/e1000_defines.h similarity index 100% rename from drivers/net/e1000/base/e1000_defines.h rename to drivers/net/intel/e1000/base/e1000_defines.h diff --git a/drivers/net/e1000/base/e1000_hw.h b/drivers/net/intel/e1000/base/e1000_hw.h similarity index 100% rename from drivers/net/e1000/base/e1000_hw.h rename to drivers/net/intel/e1000/base/e1000_hw.h diff --git a/drivers/net/e1000/base/e1000_i210.c b/drivers/net/intel/e1000/base/e1000_i210.c similarity index 100% rename from drivers/net/e1000/base/e1000_i210.c rename to drivers/net/intel/e1000/base/e1000_i210.c diff --git a/drivers/net/e1000/base/e1000_i210.h b/drivers/net/intel/e1000/base/e1000_i210.h similarity index 100% rename from drivers/net/e1000/base/e1000_i210.h rename to drivers/net/intel/e1000/base/e1000_i210.h diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/intel/e1000/base/e1000_ich8lan.c similarity index 100% rename from drivers/net/e1000/base/e1000_ich8lan.c rename to drivers/net/intel/e1000/base/e1000_ich8lan.c diff --git a/drivers/net/e1000/base/e1000_ich8lan.h b/drivers/net/intel/e1000/base/e1000_ich8lan.h similarity index 100% rename from drivers/net/e1000/base/e1000_ich8lan.h rename to drivers/net/intel/e1000/base/e1000_ich8lan.h diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/intel/e1000/base/e1000_mac.c similarity index 100% rename from drivers/net/e1000/base/e1000_mac.c rename to drivers/net/intel/e1000/base/e1000_mac.c diff --git a/drivers/net/e1000/base/e1000_mac.h b/drivers/net/intel/e1000/base/e1000_mac.h similarity index 100% rename from drivers/net/e1000/base/e1000_mac.h rename to drivers/net/intel/e1000/base/e1000_mac.h diff --git a/drivers/net/e1000/base/e1000_manage.c b/drivers/net/intel/e1000/base/e1000_manage.c similarity index 100% rename from drivers/net/e1000/base/e1000_manage.c rename to drivers/net/intel/e1000/base/e1000_manage.c diff --git a/drivers/net/e1000/base/e1000_manage.h b/drivers/net/intel/e1000/base/e1000_manage.h similarity index 100% rename from drivers/net/e1000/base/e1000_manage.h rename to drivers/net/intel/e1000/base/e1000_manage.h diff --git a/drivers/net/e1000/base/e1000_mbx.c b/drivers/net/intel/e1000/base/e1000_mbx.c similarity index 100% rename from drivers/net/e1000/base/e1000_mbx.c rename to drivers/net/intel/e1000/base/e1000_mbx.c diff --git a/drivers/net/e1000/base/e1000_mbx.h b/drivers/net/intel/e1000/base/e1000_mbx.h similarity index 100% rename from drivers/net/e1000/base/e1000_mbx.h rename to drivers/net/intel/e1000/base/e1000_mbx.h diff --git a/drivers/net/e1000/base/e1000_nvm.c b/drivers/net/intel/e1000/base/e1000_nvm.c similarity index 100% rename from drivers/net/e1000/base/e1000_nvm.c rename to drivers/net/intel/e1000/base/e1000_nvm.c diff --git a/drivers/net/e1000/base/e1000_nvm.h b/drivers/net/intel/e1000/base/e1000_nvm.h similarity index 100% rename from drivers/net/e1000/base/e1000_nvm.h rename to drivers/net/intel/e1000/base/e1000_nvm.h diff --git a/drivers/net/e1000/base/e1000_osdep.c b/drivers/net/intel/e1000/base/e1000_osdep.c similarity index 100% rename from drivers/net/e1000/base/e1000_osdep.c rename to drivers/net/intel/e1000/base/e1000_osdep.c diff --git a/drivers/net/e1000/base/e1000_osdep.h b/drivers/net/intel/e1000/base/e1000_osdep.h similarity index 100% rename from drivers/net/e1000/base/e1000_osdep.h rename to drivers/net/intel/e1000/base/e1000_osdep.h diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/intel/e1000/base/e1000_phy.c similarity index 100% rename from drivers/net/e1000/base/e1000_phy.c rename to drivers/net/intel/e1000/base/e1000_phy.c diff --git a/drivers/net/e1000/base/e1000_phy.h b/drivers/net/intel/e1000/base/e1000_phy.h similarity index 100% rename from drivers/net/e1000/base/e1000_phy.h rename to drivers/net/intel/e1000/base/e1000_phy.h diff --git a/drivers/net/e1000/base/e1000_regs.h b/drivers/net/intel/e1000/base/e1000_regs.h similarity index 100% rename from drivers/net/e1000/base/e1000_regs.h rename to drivers/net/intel/e1000/base/e1000_regs.h diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/intel/e1000/base/e1000_vf.c similarity index 100% rename from drivers/net/e1000/base/e1000_vf.c rename to drivers/net/intel/e1000/base/e1000_vf.c diff --git a/drivers/net/e1000/base/e1000_vf.h b/drivers/net/intel/e1000/base/e1000_vf.h similarity index 100% rename from drivers/net/e1000/base/e1000_vf.h rename to drivers/net/intel/e1000/base/e1000_vf.h diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/intel/e1000/base/meson.build similarity index 100% rename from drivers/net/e1000/base/meson.build rename to drivers/net/intel/e1000/base/meson.build diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/intel/e1000/e1000_ethdev.h similarity index 100% rename from drivers/net/e1000/e1000_ethdev.h rename to drivers/net/intel/e1000/e1000_ethdev.h diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/intel/e1000/e1000_logs.c similarity index 100% rename from drivers/net/e1000/e1000_logs.c rename to drivers/net/intel/e1000/e1000_logs.c diff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/intel/e1000/e1000_logs.h similarity index 100% rename from drivers/net/e1000/e1000_logs.h rename to drivers/net/intel/e1000/e1000_logs.h diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/intel/e1000/em_ethdev.c similarity index 100% rename from drivers/net/e1000/em_ethdev.c rename to drivers/net/intel/e1000/em_ethdev.c diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/intel/e1000/em_rxtx.c similarity index 100% rename from drivers/net/e1000/em_rxtx.c rename to drivers/net/intel/e1000/em_rxtx.c diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/intel/e1000/igb_ethdev.c similarity index 100% rename from drivers/net/e1000/igb_ethdev.c rename to drivers/net/intel/e1000/igb_ethdev.c diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/intel/e1000/igb_flow.c similarity index 100% rename from drivers/net/e1000/igb_flow.c rename to drivers/net/intel/e1000/igb_flow.c diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/intel/e1000/igb_pf.c similarity index 100% rename from drivers/net/e1000/igb_pf.c rename to drivers/net/intel/e1000/igb_pf.c diff --git a/drivers/net/e1000/igb_regs.h b/drivers/net/intel/e1000/igb_regs.h similarity index 100% rename from drivers/net/e1000/igb_regs.h rename to drivers/net/intel/e1000/igb_regs.h diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/intel/e1000/igb_rxtx.c similarity index 100% rename from drivers/net/e1000/igb_rxtx.c rename to drivers/net/intel/e1000/igb_rxtx.c diff --git a/drivers/net/e1000/meson.build b/drivers/net/intel/e1000/meson.build similarity index 100% rename from drivers/net/e1000/meson.build rename to drivers/net/intel/e1000/meson.build diff --git a/drivers/net/fm10k/base/fm10k_api.c b/drivers/net/intel/fm10k/base/fm10k_api.c similarity index 100% rename from drivers/net/fm10k/base/fm10k_api.c rename to drivers/net/intel/fm10k/base/fm10k_api.c diff --git a/drivers/net/fm10k/base/fm10k_api.h b/drivers/net/intel/fm10k/base/fm10k_api.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_api.h rename to drivers/net/intel/fm10k/base/fm10k_api.h diff --git a/drivers/net/fm10k/base/fm10k_common.c b/drivers/net/intel/fm10k/base/fm10k_common.c similarity index 100% rename from drivers/net/fm10k/base/fm10k_common.c rename to drivers/net/intel/fm10k/base/fm10k_common.c diff --git a/drivers/net/fm10k/base/fm10k_common.h b/drivers/net/intel/fm10k/base/fm10k_common.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_common.h rename to drivers/net/intel/fm10k/base/fm10k_common.h diff --git a/drivers/net/fm10k/base/fm10k_mbx.c b/drivers/net/intel/fm10k/base/fm10k_mbx.c similarity index 100% rename from drivers/net/fm10k/base/fm10k_mbx.c rename to drivers/net/intel/fm10k/base/fm10k_mbx.c diff --git a/drivers/net/fm10k/base/fm10k_mbx.h b/drivers/net/intel/fm10k/base/fm10k_mbx.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_mbx.h rename to drivers/net/intel/fm10k/base/fm10k_mbx.h diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/intel/fm10k/base/fm10k_osdep.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_osdep.h rename to drivers/net/intel/fm10k/base/fm10k_osdep.h diff --git a/drivers/net/fm10k/base/fm10k_pf.c b/drivers/net/intel/fm10k/base/fm10k_pf.c similarity index 100% rename from drivers/net/fm10k/base/fm10k_pf.c rename to drivers/net/intel/fm10k/base/fm10k_pf.c diff --git a/drivers/net/fm10k/base/fm10k_pf.h b/drivers/net/intel/fm10k/base/fm10k_pf.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_pf.h rename to drivers/net/intel/fm10k/base/fm10k_pf.h diff --git a/drivers/net/fm10k/base/fm10k_tlv.c b/drivers/net/intel/fm10k/base/fm10k_tlv.c similarity index 100% rename from drivers/net/fm10k/base/fm10k_tlv.c rename to drivers/net/intel/fm10k/base/fm10k_tlv.c diff --git a/drivers/net/fm10k/base/fm10k_tlv.h b/drivers/net/intel/fm10k/base/fm10k_tlv.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_tlv.h rename to drivers/net/intel/fm10k/base/fm10k_tlv.h diff --git a/drivers/net/fm10k/base/fm10k_type.h b/drivers/net/intel/fm10k/base/fm10k_type.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_type.h rename to drivers/net/intel/fm10k/base/fm10k_type.h diff --git a/drivers/net/fm10k/base/fm10k_vf.c b/drivers/net/intel/fm10k/base/fm10k_vf.c similarity index 100% rename from drivers/net/fm10k/base/fm10k_vf.c rename to drivers/net/intel/fm10k/base/fm10k_vf.c diff --git a/drivers/net/fm10k/base/fm10k_vf.h b/drivers/net/intel/fm10k/base/fm10k_vf.h similarity index 100% rename from drivers/net/fm10k/base/fm10k_vf.h rename to drivers/net/intel/fm10k/base/fm10k_vf.h diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/intel/fm10k/base/meson.build similarity index 100% rename from drivers/net/fm10k/base/meson.build rename to drivers/net/intel/fm10k/base/meson.build diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/intel/fm10k/fm10k.h similarity index 100% rename from drivers/net/fm10k/fm10k.h rename to drivers/net/intel/fm10k/fm10k.h diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/intel/fm10k/fm10k_ethdev.c similarity index 100% rename from drivers/net/fm10k/fm10k_ethdev.c rename to drivers/net/intel/fm10k/fm10k_ethdev.c diff --git a/drivers/net/fm10k/fm10k_logs.h b/drivers/net/intel/fm10k/fm10k_logs.h similarity index 100% rename from drivers/net/fm10k/fm10k_logs.h rename to drivers/net/intel/fm10k/fm10k_logs.h diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/intel/fm10k/fm10k_rxtx.c similarity index 100% rename from drivers/net/fm10k/fm10k_rxtx.c rename to drivers/net/intel/fm10k/fm10k_rxtx.c diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/intel/fm10k/fm10k_rxtx_vec.c similarity index 100% rename from drivers/net/fm10k/fm10k_rxtx_vec.c rename to drivers/net/intel/fm10k/fm10k_rxtx_vec.c diff --git a/drivers/net/fm10k/meson.build b/drivers/net/intel/fm10k/meson.build similarity index 100% rename from drivers/net/fm10k/meson.build rename to drivers/net/intel/fm10k/meson.build diff --git a/drivers/net/i40e/base/README b/drivers/net/intel/i40e/base/README similarity index 100% rename from drivers/net/i40e/base/README rename to drivers/net/intel/i40e/base/README diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/intel/i40e/base/i40e_adminq.c similarity index 100% rename from drivers/net/i40e/base/i40e_adminq.c rename to drivers/net/intel/i40e/base/i40e_adminq.c diff --git a/drivers/net/i40e/base/i40e_adminq.h b/drivers/net/intel/i40e/base/i40e_adminq.h similarity index 100% rename from drivers/net/i40e/base/i40e_adminq.h rename to drivers/net/intel/i40e/base/i40e_adminq.h diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h b/drivers/net/intel/i40e/base/i40e_adminq_cmd.h similarity index 100% rename from drivers/net/i40e/base/i40e_adminq_cmd.h rename to drivers/net/intel/i40e/base/i40e_adminq_cmd.h diff --git a/drivers/net/i40e/base/i40e_alloc.h b/drivers/net/intel/i40e/base/i40e_alloc.h similarity index 100% rename from drivers/net/i40e/base/i40e_alloc.h rename to drivers/net/intel/i40e/base/i40e_alloc.h diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/intel/i40e/base/i40e_common.c similarity index 100% rename from drivers/net/i40e/base/i40e_common.c rename to drivers/net/intel/i40e/base/i40e_common.c diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/intel/i40e/base/i40e_dcb.c similarity index 100% rename from drivers/net/i40e/base/i40e_dcb.c rename to drivers/net/intel/i40e/base/i40e_dcb.c diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/intel/i40e/base/i40e_dcb.h similarity index 100% rename from drivers/net/i40e/base/i40e_dcb.h rename to drivers/net/intel/i40e/base/i40e_dcb.h diff --git a/drivers/net/i40e/base/i40e_devids.h b/drivers/net/intel/i40e/base/i40e_devids.h similarity index 100% rename from drivers/net/i40e/base/i40e_devids.h rename to drivers/net/intel/i40e/base/i40e_devids.h diff --git a/drivers/net/i40e/base/i40e_diag.c b/drivers/net/intel/i40e/base/i40e_diag.c similarity index 100% rename from drivers/net/i40e/base/i40e_diag.c rename to drivers/net/intel/i40e/base/i40e_diag.c diff --git a/drivers/net/i40e/base/i40e_diag.h b/drivers/net/intel/i40e/base/i40e_diag.h similarity index 100% rename from drivers/net/i40e/base/i40e_diag.h rename to drivers/net/intel/i40e/base/i40e_diag.h diff --git a/drivers/net/i40e/base/i40e_hmc.c b/drivers/net/intel/i40e/base/i40e_hmc.c similarity index 100% rename from drivers/net/i40e/base/i40e_hmc.c rename to drivers/net/intel/i40e/base/i40e_hmc.c diff --git a/drivers/net/i40e/base/i40e_hmc.h b/drivers/net/intel/i40e/base/i40e_hmc.h similarity index 100% rename from drivers/net/i40e/base/i40e_hmc.h rename to drivers/net/intel/i40e/base/i40e_hmc.h diff --git a/drivers/net/i40e/base/i40e_lan_hmc.c b/drivers/net/intel/i40e/base/i40e_lan_hmc.c similarity index 100% rename from drivers/net/i40e/base/i40e_lan_hmc.c rename to drivers/net/intel/i40e/base/i40e_lan_hmc.c diff --git a/drivers/net/i40e/base/i40e_lan_hmc.h b/drivers/net/intel/i40e/base/i40e_lan_hmc.h similarity index 100% rename from drivers/net/i40e/base/i40e_lan_hmc.h rename to drivers/net/intel/i40e/base/i40e_lan_hmc.h diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/intel/i40e/base/i40e_nvm.c similarity index 100% rename from drivers/net/i40e/base/i40e_nvm.c rename to drivers/net/intel/i40e/base/i40e_nvm.c diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/intel/i40e/base/i40e_osdep.h similarity index 100% rename from drivers/net/i40e/base/i40e_osdep.h rename to drivers/net/intel/i40e/base/i40e_osdep.h diff --git a/drivers/net/i40e/base/i40e_prototype.h b/drivers/net/intel/i40e/base/i40e_prototype.h similarity index 100% rename from drivers/net/i40e/base/i40e_prototype.h rename to drivers/net/intel/i40e/base/i40e_prototype.h diff --git a/drivers/net/i40e/base/i40e_register.h b/drivers/net/intel/i40e/base/i40e_register.h similarity index 100% rename from drivers/net/i40e/base/i40e_register.h rename to drivers/net/intel/i40e/base/i40e_register.h diff --git a/drivers/net/i40e/base/i40e_status.h b/drivers/net/intel/i40e/base/i40e_status.h similarity index 100% rename from drivers/net/i40e/base/i40e_status.h rename to drivers/net/intel/i40e/base/i40e_status.h diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/intel/i40e/base/i40e_type.h similarity index 100% rename from drivers/net/i40e/base/i40e_type.h rename to drivers/net/intel/i40e/base/i40e_type.h diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/intel/i40e/base/meson.build similarity index 100% rename from drivers/net/i40e/base/meson.build rename to drivers/net/intel/i40e/base/meson.build diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/intel/i40e/base/virtchnl.h similarity index 100% rename from drivers/net/i40e/base/virtchnl.h rename to drivers/net/intel/i40e/base/virtchnl.h diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c similarity index 100% rename from drivers/net/i40e/i40e_ethdev.c rename to drivers/net/intel/i40e/i40e_ethdev.c diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/intel/i40e/i40e_ethdev.h similarity index 100% rename from drivers/net/i40e/i40e_ethdev.h rename to drivers/net/intel/i40e/i40e_ethdev.h diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/intel/i40e/i40e_fdir.c similarity index 100% rename from drivers/net/i40e/i40e_fdir.c rename to drivers/net/intel/i40e/i40e_fdir.c diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/intel/i40e/i40e_flow.c similarity index 100% rename from drivers/net/i40e/i40e_flow.c rename to drivers/net/intel/i40e/i40e_flow.c diff --git a/drivers/net/i40e/i40e_hash.c b/drivers/net/intel/i40e/i40e_hash.c similarity index 100% rename from drivers/net/i40e/i40e_hash.c rename to drivers/net/intel/i40e/i40e_hash.c diff --git a/drivers/net/i40e/i40e_hash.h b/drivers/net/intel/i40e/i40e_hash.h similarity index 100% rename from drivers/net/i40e/i40e_hash.h rename to drivers/net/intel/i40e/i40e_hash.h diff --git a/drivers/net/i40e/i40e_logs.h b/drivers/net/intel/i40e/i40e_logs.h similarity index 100% rename from drivers/net/i40e/i40e_logs.h rename to drivers/net/intel/i40e/i40e_logs.h diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/intel/i40e/i40e_pf.c similarity index 100% rename from drivers/net/i40e/i40e_pf.c rename to drivers/net/intel/i40e/i40e_pf.c diff --git a/drivers/net/i40e/i40e_pf.h b/drivers/net/intel/i40e/i40e_pf.h similarity index 100% rename from drivers/net/i40e/i40e_pf.h rename to drivers/net/intel/i40e/i40e_pf.h diff --git a/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c b/drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c similarity index 100% rename from drivers/net/i40e/i40e_recycle_mbufs_vec_common.c rename to drivers/net/intel/i40e/i40e_recycle_mbufs_vec_common.c diff --git a/drivers/net/i40e/i40e_regs.h b/drivers/net/intel/i40e/i40e_regs.h similarity index 100% rename from drivers/net/i40e/i40e_regs.h rename to drivers/net/intel/i40e/i40e_regs.h diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/intel/i40e/i40e_rxtx.c similarity index 100% rename from drivers/net/i40e/i40e_rxtx.c rename to drivers/net/intel/i40e/i40e_rxtx.c diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/intel/i40e/i40e_rxtx.h similarity index 100% rename from drivers/net/i40e/i40e_rxtx.h rename to drivers/net/intel/i40e/i40e_rxtx.h diff --git a/drivers/net/i40e/i40e_rxtx_common_avx.h b/drivers/net/intel/i40e/i40e_rxtx_common_avx.h similarity index 100% rename from drivers/net/i40e/i40e_rxtx_common_avx.h rename to drivers/net/intel/i40e/i40e_rxtx_common_avx.h diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c similarity index 100% rename from drivers/net/i40e/i40e_rxtx_vec_altivec.c rename to drivers/net/intel/i40e/i40e_rxtx_vec_altivec.c diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c similarity index 100% rename from drivers/net/i40e/i40e_rxtx_vec_avx2.c rename to drivers/net/intel/i40e/i40e_rxtx_vec_avx2.c diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c similarity index 100% rename from drivers/net/i40e/i40e_rxtx_vec_avx512.c rename to drivers/net/intel/i40e/i40e_rxtx_vec_avx512.c diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/intel/i40e/i40e_rxtx_vec_common.h similarity index 100% rename from drivers/net/i40e/i40e_rxtx_vec_common.h rename to drivers/net/intel/i40e/i40e_rxtx_vec_common.h diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/intel/i40e/i40e_rxtx_vec_neon.c similarity index 100% rename from drivers/net/i40e/i40e_rxtx_vec_neon.c rename to drivers/net/intel/i40e/i40e_rxtx_vec_neon.c diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/intel/i40e/i40e_rxtx_vec_sse.c similarity index 100% rename from drivers/net/i40e/i40e_rxtx_vec_sse.c rename to drivers/net/intel/i40e/i40e_rxtx_vec_sse.c diff --git a/drivers/net/i40e/i40e_testpmd.c b/drivers/net/intel/i40e/i40e_testpmd.c similarity index 100% rename from drivers/net/i40e/i40e_testpmd.c rename to drivers/net/intel/i40e/i40e_testpmd.c diff --git a/drivers/net/i40e/i40e_tm.c b/drivers/net/intel/i40e/i40e_tm.c similarity index 100% rename from drivers/net/i40e/i40e_tm.c rename to drivers/net/intel/i40e/i40e_tm.c diff --git a/drivers/net/i40e/i40e_vf_representor.c b/drivers/net/intel/i40e/i40e_vf_representor.c similarity index 100% rename from drivers/net/i40e/i40e_vf_representor.c rename to drivers/net/intel/i40e/i40e_vf_representor.c diff --git a/drivers/net/i40e/meson.build b/drivers/net/intel/i40e/meson.build similarity index 100% rename from drivers/net/i40e/meson.build rename to drivers/net/intel/i40e/meson.build diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/intel/i40e/rte_pmd_i40e.c similarity index 100% rename from drivers/net/i40e/rte_pmd_i40e.c rename to drivers/net/intel/i40e/rte_pmd_i40e.c diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/intel/i40e/rte_pmd_i40e.h similarity index 100% rename from drivers/net/i40e/rte_pmd_i40e.h rename to drivers/net/intel/i40e/rte_pmd_i40e.h diff --git a/drivers/net/i40e/version.map b/drivers/net/intel/i40e/version.map similarity index 100% rename from drivers/net/i40e/version.map rename to drivers/net/intel/i40e/version.map diff --git a/drivers/net/iavf/iavf.h b/drivers/net/intel/iavf/iavf.h similarity index 100% rename from drivers/net/iavf/iavf.h rename to drivers/net/intel/iavf/iavf.h diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c similarity index 100% rename from drivers/net/iavf/iavf_ethdev.c rename to drivers/net/intel/iavf/iavf_ethdev.c diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/intel/iavf/iavf_fdir.c similarity index 100% rename from drivers/net/iavf/iavf_fdir.c rename to drivers/net/intel/iavf/iavf_fdir.c diff --git a/drivers/net/iavf/iavf_fsub.c b/drivers/net/intel/iavf/iavf_fsub.c similarity index 100% rename from drivers/net/iavf/iavf_fsub.c rename to drivers/net/intel/iavf/iavf_fsub.c diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/intel/iavf/iavf_generic_flow.c similarity index 100% rename from drivers/net/iavf/iavf_generic_flow.c rename to drivers/net/intel/iavf/iavf_generic_flow.c diff --git a/drivers/net/iavf/iavf_generic_flow.h b/drivers/net/intel/iavf/iavf_generic_flow.h similarity index 100% rename from drivers/net/iavf/iavf_generic_flow.h rename to drivers/net/intel/iavf/iavf_generic_flow.h diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/intel/iavf/iavf_hash.c similarity index 100% rename from drivers/net/iavf/iavf_hash.c rename to drivers/net/intel/iavf/iavf_hash.c diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/intel/iavf/iavf_ipsec_crypto.c similarity index 100% rename from drivers/net/iavf/iavf_ipsec_crypto.c rename to drivers/net/intel/iavf/iavf_ipsec_crypto.c diff --git a/drivers/net/iavf/iavf_ipsec_crypto.h b/drivers/net/intel/iavf/iavf_ipsec_crypto.h similarity index 100% rename from drivers/net/iavf/iavf_ipsec_crypto.h rename to drivers/net/intel/iavf/iavf_ipsec_crypto.h diff --git a/drivers/net/iavf/iavf_ipsec_crypto_capabilities.h b/drivers/net/intel/iavf/iavf_ipsec_crypto_capabilities.h similarity index 100% rename from drivers/net/iavf/iavf_ipsec_crypto_capabilities.h rename to drivers/net/intel/iavf/iavf_ipsec_crypto_capabilities.h diff --git a/drivers/net/iavf/iavf_log.h b/drivers/net/intel/iavf/iavf_log.h similarity index 100% rename from drivers/net/iavf/iavf_log.h rename to drivers/net/intel/iavf/iavf_log.h diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/intel/iavf/iavf_rxtx.c similarity index 100% rename from drivers/net/iavf/iavf_rxtx.c rename to drivers/net/intel/iavf/iavf_rxtx.c diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/intel/iavf/iavf_rxtx.h similarity index 100% rename from drivers/net/iavf/iavf_rxtx.h rename to drivers/net/intel/iavf/iavf_rxtx.h diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c similarity index 100% rename from drivers/net/iavf/iavf_rxtx_vec_avx2.c rename to drivers/net/intel/iavf/iavf_rxtx_vec_avx2.c diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c b/drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c similarity index 100% rename from drivers/net/iavf/iavf_rxtx_vec_avx512.c rename to drivers/net/intel/iavf/iavf_rxtx_vec_avx512.c diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/intel/iavf/iavf_rxtx_vec_common.h similarity index 100% rename from drivers/net/iavf/iavf_rxtx_vec_common.h rename to drivers/net/intel/iavf/iavf_rxtx_vec_common.h diff --git a/drivers/net/iavf/iavf_rxtx_vec_neon.c b/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c similarity index 100% rename from drivers/net/iavf/iavf_rxtx_vec_neon.c rename to drivers/net/intel/iavf/iavf_rxtx_vec_neon.c diff --git a/drivers/net/iavf/iavf_rxtx_vec_sse.c b/drivers/net/intel/iavf/iavf_rxtx_vec_sse.c similarity index 100% rename from drivers/net/iavf/iavf_rxtx_vec_sse.c rename to drivers/net/intel/iavf/iavf_rxtx_vec_sse.c diff --git a/drivers/net/iavf/iavf_testpmd.c b/drivers/net/intel/iavf/iavf_testpmd.c similarity index 100% rename from drivers/net/iavf/iavf_testpmd.c rename to drivers/net/intel/iavf/iavf_testpmd.c diff --git a/drivers/net/iavf/iavf_tm.c b/drivers/net/intel/iavf/iavf_tm.c similarity index 100% rename from drivers/net/iavf/iavf_tm.c rename to drivers/net/intel/iavf/iavf_tm.c diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/intel/iavf/iavf_vchnl.c similarity index 100% rename from drivers/net/iavf/iavf_vchnl.c rename to drivers/net/intel/iavf/iavf_vchnl.c diff --git a/drivers/net/iavf/meson.build b/drivers/net/intel/iavf/meson.build similarity index 86% rename from drivers/net/iavf/meson.build rename to drivers/net/intel/iavf/meson.build index b48bb83438..08b51b2859 100644 --- a/drivers/net/iavf/meson.build +++ b/drivers/net/intel/iavf/meson.build @@ -5,8 +5,6 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0 subdir_done() endif -includes += include_directories('../../common/iavf') - testpmd_sources = files('iavf_testpmd.c') deps += ['common_iavf', 'security', 'cryptodev'] @@ -32,7 +30,7 @@ if arch_subdir == 'x86' iavf_avx2_lib = static_library('iavf_avx2_lib', 'iavf_rxtx_vec_avx2.c', - dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_common_iavf], include_directories: includes, c_args: [cflags, '-mavx2']) objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c') @@ -45,8 +43,7 @@ if arch_subdir == 'x86' endif iavf_avx512_lib = static_library('iavf_avx512_lib', 'iavf_rxtx_vec_avx512.c', - dependencies: [static_rte_ethdev, - static_rte_kvargs, static_rte_hash], + dependencies: [static_rte_ethdev, static_rte_common_iavf], include_directories: includes, c_args: avx512_args) objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c') diff --git a/drivers/net/iavf/rte_pmd_iavf.h b/drivers/net/intel/iavf/rte_pmd_iavf.h similarity index 100% rename from drivers/net/iavf/rte_pmd_iavf.h rename to drivers/net/intel/iavf/rte_pmd_iavf.h diff --git a/drivers/net/iavf/version.map b/drivers/net/intel/iavf/version.map similarity index 100% rename from drivers/net/iavf/version.map rename to drivers/net/intel/iavf/version.map diff --git a/drivers/net/ice/base/README b/drivers/net/intel/ice/base/README similarity index 100% rename from drivers/net/ice/base/README rename to drivers/net/intel/ice/base/README diff --git a/drivers/net/ice/base/ice_acl.c b/drivers/net/intel/ice/base/ice_acl.c similarity index 100% rename from drivers/net/ice/base/ice_acl.c rename to drivers/net/intel/ice/base/ice_acl.c diff --git a/drivers/net/ice/base/ice_acl.h b/drivers/net/intel/ice/base/ice_acl.h similarity index 100% rename from drivers/net/ice/base/ice_acl.h rename to drivers/net/intel/ice/base/ice_acl.h diff --git a/drivers/net/ice/base/ice_acl_ctrl.c b/drivers/net/intel/ice/base/ice_acl_ctrl.c similarity index 100% rename from drivers/net/ice/base/ice_acl_ctrl.c rename to drivers/net/intel/ice/base/ice_acl_ctrl.c diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/intel/ice/base/ice_adminq_cmd.h similarity index 100% rename from drivers/net/ice/base/ice_adminq_cmd.h rename to drivers/net/intel/ice/base/ice_adminq_cmd.h diff --git a/drivers/net/ice/base/ice_alloc.h b/drivers/net/intel/ice/base/ice_alloc.h similarity index 100% rename from drivers/net/ice/base/ice_alloc.h rename to drivers/net/intel/ice/base/ice_alloc.h diff --git a/drivers/net/ice/base/ice_bitops.h b/drivers/net/intel/ice/base/ice_bitops.h similarity index 100% rename from drivers/net/ice/base/ice_bitops.h rename to drivers/net/intel/ice/base/ice_bitops.h diff --git a/drivers/net/ice/base/ice_bst_tcam.c b/drivers/net/intel/ice/base/ice_bst_tcam.c similarity index 100% rename from drivers/net/ice/base/ice_bst_tcam.c rename to drivers/net/intel/ice/base/ice_bst_tcam.c diff --git a/drivers/net/ice/base/ice_bst_tcam.h b/drivers/net/intel/ice/base/ice_bst_tcam.h similarity index 100% rename from drivers/net/ice/base/ice_bst_tcam.h rename to drivers/net/intel/ice/base/ice_bst_tcam.h diff --git a/drivers/net/ice/base/ice_cgu_regs.h b/drivers/net/intel/ice/base/ice_cgu_regs.h similarity index 100% rename from drivers/net/ice/base/ice_cgu_regs.h rename to drivers/net/intel/ice/base/ice_cgu_regs.h diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/intel/ice/base/ice_common.c similarity index 100% rename from drivers/net/ice/base/ice_common.c rename to drivers/net/intel/ice/base/ice_common.c diff --git a/drivers/net/ice/base/ice_common.h b/drivers/net/intel/ice/base/ice_common.h similarity index 100% rename from drivers/net/ice/base/ice_common.h rename to drivers/net/intel/ice/base/ice_common.h diff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/intel/ice/base/ice_controlq.c similarity index 100% rename from drivers/net/ice/base/ice_controlq.c rename to drivers/net/intel/ice/base/ice_controlq.c diff --git a/drivers/net/ice/base/ice_controlq.h b/drivers/net/intel/ice/base/ice_controlq.h similarity index 100% rename from drivers/net/ice/base/ice_controlq.h rename to drivers/net/intel/ice/base/ice_controlq.h diff --git a/drivers/net/ice/base/ice_dcb.c b/drivers/net/intel/ice/base/ice_dcb.c similarity index 100% rename from drivers/net/ice/base/ice_dcb.c rename to drivers/net/intel/ice/base/ice_dcb.c diff --git a/drivers/net/ice/base/ice_dcb.h b/drivers/net/intel/ice/base/ice_dcb.h similarity index 100% rename from drivers/net/ice/base/ice_dcb.h rename to drivers/net/intel/ice/base/ice_dcb.h diff --git a/drivers/net/ice/base/ice_ddp.c b/drivers/net/intel/ice/base/ice_ddp.c similarity index 100% rename from drivers/net/ice/base/ice_ddp.c rename to drivers/net/intel/ice/base/ice_ddp.c diff --git a/drivers/net/ice/base/ice_ddp.h b/drivers/net/intel/ice/base/ice_ddp.h similarity index 100% rename from drivers/net/ice/base/ice_ddp.h rename to drivers/net/intel/ice/base/ice_ddp.h diff --git a/drivers/net/ice/base/ice_defs.h b/drivers/net/intel/ice/base/ice_defs.h similarity index 100% rename from drivers/net/ice/base/ice_defs.h rename to drivers/net/intel/ice/base/ice_defs.h diff --git a/drivers/net/ice/base/ice_devids.h b/drivers/net/intel/ice/base/ice_devids.h similarity index 100% rename from drivers/net/ice/base/ice_devids.h rename to drivers/net/intel/ice/base/ice_devids.h diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/intel/ice/base/ice_fdir.c similarity index 100% rename from drivers/net/ice/base/ice_fdir.c rename to drivers/net/intel/ice/base/ice_fdir.c diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/intel/ice/base/ice_fdir.h similarity index 100% rename from drivers/net/ice/base/ice_fdir.h rename to drivers/net/intel/ice/base/ice_fdir.h diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/intel/ice/base/ice_flex_pipe.c similarity index 100% rename from drivers/net/ice/base/ice_flex_pipe.c rename to drivers/net/intel/ice/base/ice_flex_pipe.c diff --git a/drivers/net/ice/base/ice_flex_pipe.h b/drivers/net/intel/ice/base/ice_flex_pipe.h similarity index 100% rename from drivers/net/ice/base/ice_flex_pipe.h rename to drivers/net/intel/ice/base/ice_flex_pipe.h diff --git a/drivers/net/ice/base/ice_flex_type.h b/drivers/net/intel/ice/base/ice_flex_type.h similarity index 100% rename from drivers/net/ice/base/ice_flex_type.h rename to drivers/net/intel/ice/base/ice_flex_type.h diff --git a/drivers/net/ice/base/ice_flg_rd.c b/drivers/net/intel/ice/base/ice_flg_rd.c similarity index 100% rename from drivers/net/ice/base/ice_flg_rd.c rename to drivers/net/intel/ice/base/ice_flg_rd.c diff --git a/drivers/net/ice/base/ice_flg_rd.h b/drivers/net/intel/ice/base/ice_flg_rd.h similarity index 100% rename from drivers/net/ice/base/ice_flg_rd.h rename to drivers/net/intel/ice/base/ice_flg_rd.h diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/intel/ice/base/ice_flow.c similarity index 100% rename from drivers/net/ice/base/ice_flow.c rename to drivers/net/intel/ice/base/ice_flow.c diff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/intel/ice/base/ice_flow.h similarity index 100% rename from drivers/net/ice/base/ice_flow.h rename to drivers/net/intel/ice/base/ice_flow.h diff --git a/drivers/net/ice/base/ice_fwlog.c b/drivers/net/intel/ice/base/ice_fwlog.c similarity index 100% rename from drivers/net/ice/base/ice_fwlog.c rename to drivers/net/intel/ice/base/ice_fwlog.c diff --git a/drivers/net/ice/base/ice_fwlog.h b/drivers/net/intel/ice/base/ice_fwlog.h similarity index 100% rename from drivers/net/ice/base/ice_fwlog.h rename to drivers/net/intel/ice/base/ice_fwlog.h diff --git a/drivers/net/ice/base/ice_hw_autogen.h b/drivers/net/intel/ice/base/ice_hw_autogen.h similarity index 100% rename from drivers/net/ice/base/ice_hw_autogen.h rename to drivers/net/intel/ice/base/ice_hw_autogen.h diff --git a/drivers/net/ice/base/ice_imem.c b/drivers/net/intel/ice/base/ice_imem.c similarity index 100% rename from drivers/net/ice/base/ice_imem.c rename to drivers/net/intel/ice/base/ice_imem.c diff --git a/drivers/net/ice/base/ice_imem.h b/drivers/net/intel/ice/base/ice_imem.h similarity index 100% rename from drivers/net/ice/base/ice_imem.h rename to drivers/net/intel/ice/base/ice_imem.h diff --git a/drivers/net/ice/base/ice_lan_tx_rx.h b/drivers/net/intel/ice/base/ice_lan_tx_rx.h similarity index 100% rename from drivers/net/ice/base/ice_lan_tx_rx.h rename to drivers/net/intel/ice/base/ice_lan_tx_rx.h diff --git a/drivers/net/ice/base/ice_metainit.c b/drivers/net/intel/ice/base/ice_metainit.c similarity index 100% rename from drivers/net/ice/base/ice_metainit.c rename to drivers/net/intel/ice/base/ice_metainit.c diff --git a/drivers/net/ice/base/ice_metainit.h b/drivers/net/intel/ice/base/ice_metainit.h similarity index 100% rename from drivers/net/ice/base/ice_metainit.h rename to drivers/net/intel/ice/base/ice_metainit.h diff --git a/drivers/net/ice/base/ice_mk_grp.c b/drivers/net/intel/ice/base/ice_mk_grp.c similarity index 100% rename from drivers/net/ice/base/ice_mk_grp.c rename to drivers/net/intel/ice/base/ice_mk_grp.c diff --git a/drivers/net/ice/base/ice_mk_grp.h b/drivers/net/intel/ice/base/ice_mk_grp.h similarity index 100% rename from drivers/net/ice/base/ice_mk_grp.h rename to drivers/net/intel/ice/base/ice_mk_grp.h diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/intel/ice/base/ice_nvm.c similarity index 100% rename from drivers/net/ice/base/ice_nvm.c rename to drivers/net/intel/ice/base/ice_nvm.c diff --git a/drivers/net/ice/base/ice_nvm.h b/drivers/net/intel/ice/base/ice_nvm.h similarity index 100% rename from drivers/net/ice/base/ice_nvm.h rename to drivers/net/intel/ice/base/ice_nvm.h diff --git a/drivers/net/ice/base/ice_osdep.h b/drivers/net/intel/ice/base/ice_osdep.h similarity index 100% rename from drivers/net/ice/base/ice_osdep.h rename to drivers/net/intel/ice/base/ice_osdep.h diff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/intel/ice/base/ice_parser.c similarity index 100% rename from drivers/net/ice/base/ice_parser.c rename to drivers/net/intel/ice/base/ice_parser.c diff --git a/drivers/net/ice/base/ice_parser.h b/drivers/net/intel/ice/base/ice_parser.h similarity index 100% rename from drivers/net/ice/base/ice_parser.h rename to drivers/net/intel/ice/base/ice_parser.h diff --git a/drivers/net/ice/base/ice_parser_rt.c b/drivers/net/intel/ice/base/ice_parser_rt.c similarity index 100% rename from drivers/net/ice/base/ice_parser_rt.c rename to drivers/net/intel/ice/base/ice_parser_rt.c diff --git a/drivers/net/ice/base/ice_parser_rt.h b/drivers/net/intel/ice/base/ice_parser_rt.h similarity index 100% rename from drivers/net/ice/base/ice_parser_rt.h rename to drivers/net/intel/ice/base/ice_parser_rt.h diff --git a/drivers/net/ice/base/ice_parser_util.h b/drivers/net/intel/ice/base/ice_parser_util.h similarity index 100% rename from drivers/net/ice/base/ice_parser_util.h rename to drivers/net/intel/ice/base/ice_parser_util.h diff --git a/drivers/net/ice/base/ice_pg_cam.c b/drivers/net/intel/ice/base/ice_pg_cam.c similarity index 100% rename from drivers/net/ice/base/ice_pg_cam.c rename to drivers/net/intel/ice/base/ice_pg_cam.c diff --git a/drivers/net/ice/base/ice_pg_cam.h b/drivers/net/intel/ice/base/ice_pg_cam.h similarity index 100% rename from drivers/net/ice/base/ice_pg_cam.h rename to drivers/net/intel/ice/base/ice_pg_cam.h diff --git a/drivers/net/ice/base/ice_phy_regs.h b/drivers/net/intel/ice/base/ice_phy_regs.h similarity index 100% rename from drivers/net/ice/base/ice_phy_regs.h rename to drivers/net/intel/ice/base/ice_phy_regs.h diff --git a/drivers/net/ice/base/ice_proto_grp.c b/drivers/net/intel/ice/base/ice_proto_grp.c similarity index 100% rename from drivers/net/ice/base/ice_proto_grp.c rename to drivers/net/intel/ice/base/ice_proto_grp.c diff --git a/drivers/net/ice/base/ice_proto_grp.h b/drivers/net/intel/ice/base/ice_proto_grp.h similarity index 100% rename from drivers/net/ice/base/ice_proto_grp.h rename to drivers/net/intel/ice/base/ice_proto_grp.h diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/intel/ice/base/ice_protocol_type.h similarity index 100% rename from drivers/net/ice/base/ice_protocol_type.h rename to drivers/net/intel/ice/base/ice_protocol_type.h diff --git a/drivers/net/ice/base/ice_ptp_consts.h b/drivers/net/intel/ice/base/ice_ptp_consts.h similarity index 100% rename from drivers/net/ice/base/ice_ptp_consts.h rename to drivers/net/intel/ice/base/ice_ptp_consts.h diff --git a/drivers/net/ice/base/ice_ptp_hw.c b/drivers/net/intel/ice/base/ice_ptp_hw.c similarity index 100% rename from drivers/net/ice/base/ice_ptp_hw.c rename to drivers/net/intel/ice/base/ice_ptp_hw.c diff --git a/drivers/net/ice/base/ice_ptp_hw.h b/drivers/net/intel/ice/base/ice_ptp_hw.h similarity index 100% rename from drivers/net/ice/base/ice_ptp_hw.h rename to drivers/net/intel/ice/base/ice_ptp_hw.h diff --git a/drivers/net/ice/base/ice_ptype_mk.c b/drivers/net/intel/ice/base/ice_ptype_mk.c similarity index 100% rename from drivers/net/ice/base/ice_ptype_mk.c rename to drivers/net/intel/ice/base/ice_ptype_mk.c diff --git a/drivers/net/ice/base/ice_ptype_mk.h b/drivers/net/intel/ice/base/ice_ptype_mk.h similarity index 100% rename from drivers/net/ice/base/ice_ptype_mk.h rename to drivers/net/intel/ice/base/ice_ptype_mk.h diff --git a/drivers/net/ice/base/ice_sbq_cmd.h b/drivers/net/intel/ice/base/ice_sbq_cmd.h similarity index 100% rename from drivers/net/ice/base/ice_sbq_cmd.h rename to drivers/net/intel/ice/base/ice_sbq_cmd.h diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/intel/ice/base/ice_sched.c similarity index 100% rename from drivers/net/ice/base/ice_sched.c rename to drivers/net/intel/ice/base/ice_sched.c diff --git a/drivers/net/ice/base/ice_sched.h b/drivers/net/intel/ice/base/ice_sched.h similarity index 100% rename from drivers/net/ice/base/ice_sched.h rename to drivers/net/intel/ice/base/ice_sched.h diff --git a/drivers/net/ice/base/ice_status.h b/drivers/net/intel/ice/base/ice_status.h similarity index 100% rename from drivers/net/ice/base/ice_status.h rename to drivers/net/intel/ice/base/ice_status.h diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/intel/ice/base/ice_switch.c similarity index 100% rename from drivers/net/ice/base/ice_switch.c rename to drivers/net/intel/ice/base/ice_switch.c diff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/intel/ice/base/ice_switch.h similarity index 100% rename from drivers/net/ice/base/ice_switch.h rename to drivers/net/intel/ice/base/ice_switch.h diff --git a/drivers/net/ice/base/ice_tmatch.h b/drivers/net/intel/ice/base/ice_tmatch.h similarity index 100% rename from drivers/net/ice/base/ice_tmatch.h rename to drivers/net/intel/ice/base/ice_tmatch.h diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/intel/ice/base/ice_type.h similarity index 100% rename from drivers/net/ice/base/ice_type.h rename to drivers/net/intel/ice/base/ice_type.h diff --git a/drivers/net/ice/base/ice_vf_mbx.c b/drivers/net/intel/ice/base/ice_vf_mbx.c similarity index 100% rename from drivers/net/ice/base/ice_vf_mbx.c rename to drivers/net/intel/ice/base/ice_vf_mbx.c diff --git a/drivers/net/ice/base/ice_vf_mbx.h b/drivers/net/intel/ice/base/ice_vf_mbx.h similarity index 100% rename from drivers/net/ice/base/ice_vf_mbx.h rename to drivers/net/intel/ice/base/ice_vf_mbx.h diff --git a/drivers/net/ice/base/ice_vlan_mode.c b/drivers/net/intel/ice/base/ice_vlan_mode.c similarity index 100% rename from drivers/net/ice/base/ice_vlan_mode.c rename to drivers/net/intel/ice/base/ice_vlan_mode.c diff --git a/drivers/net/ice/base/ice_vlan_mode.h b/drivers/net/intel/ice/base/ice_vlan_mode.h similarity index 100% rename from drivers/net/ice/base/ice_vlan_mode.h rename to drivers/net/intel/ice/base/ice_vlan_mode.h diff --git a/drivers/net/ice/base/ice_xlt_kb.c b/drivers/net/intel/ice/base/ice_xlt_kb.c similarity index 100% rename from drivers/net/ice/base/ice_xlt_kb.c rename to drivers/net/intel/ice/base/ice_xlt_kb.c diff --git a/drivers/net/ice/base/ice_xlt_kb.h b/drivers/net/intel/ice/base/ice_xlt_kb.h similarity index 100% rename from drivers/net/ice/base/ice_xlt_kb.h rename to drivers/net/intel/ice/base/ice_xlt_kb.h diff --git a/drivers/net/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build similarity index 100% rename from drivers/net/ice/base/meson.build rename to drivers/net/intel/ice/base/meson.build diff --git a/drivers/net/ice/ice_acl_filter.c b/drivers/net/intel/ice/ice_acl_filter.c similarity index 100% rename from drivers/net/ice/ice_acl_filter.c rename to drivers/net/intel/ice/ice_acl_filter.c diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/intel/ice/ice_dcf.c similarity index 100% rename from drivers/net/ice/ice_dcf.c rename to drivers/net/intel/ice/ice_dcf.c diff --git a/drivers/net/ice/ice_dcf.h b/drivers/net/intel/ice/ice_dcf.h similarity index 100% rename from drivers/net/ice/ice_dcf.h rename to drivers/net/intel/ice/ice_dcf.h diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/intel/ice/ice_dcf_ethdev.c similarity index 100% rename from drivers/net/ice/ice_dcf_ethdev.c rename to drivers/net/intel/ice/ice_dcf_ethdev.c diff --git a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/intel/ice/ice_dcf_ethdev.h similarity index 100% rename from drivers/net/ice/ice_dcf_ethdev.h rename to drivers/net/intel/ice/ice_dcf_ethdev.h diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/intel/ice/ice_dcf_parent.c similarity index 100% rename from drivers/net/ice/ice_dcf_parent.c rename to drivers/net/intel/ice/ice_dcf_parent.c diff --git a/drivers/net/ice/ice_dcf_sched.c b/drivers/net/intel/ice/ice_dcf_sched.c similarity index 100% rename from drivers/net/ice/ice_dcf_sched.c rename to drivers/net/intel/ice/ice_dcf_sched.c diff --git a/drivers/net/ice/ice_dcf_vf_representor.c b/drivers/net/intel/ice/ice_dcf_vf_representor.c similarity index 100% rename from drivers/net/ice/ice_dcf_vf_representor.c rename to drivers/net/intel/ice/ice_dcf_vf_representor.c diff --git a/drivers/net/ice/ice_diagnose.c b/drivers/net/intel/ice/ice_diagnose.c similarity index 100% rename from drivers/net/ice/ice_diagnose.c rename to drivers/net/intel/ice/ice_diagnose.c diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c similarity index 100% rename from drivers/net/ice/ice_ethdev.c rename to drivers/net/intel/ice/ice_ethdev.c diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/intel/ice/ice_ethdev.h similarity index 100% rename from drivers/net/ice/ice_ethdev.h rename to drivers/net/intel/ice/ice_ethdev.h diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c similarity index 100% rename from drivers/net/ice/ice_fdir_filter.c rename to drivers/net/intel/ice/ice_fdir_filter.c diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/intel/ice/ice_generic_flow.c similarity index 100% rename from drivers/net/ice/ice_generic_flow.c rename to drivers/net/intel/ice/ice_generic_flow.c diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/intel/ice/ice_generic_flow.h similarity index 100% rename from drivers/net/ice/ice_generic_flow.h rename to drivers/net/intel/ice/ice_generic_flow.h diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/intel/ice/ice_hash.c similarity index 100% rename from drivers/net/ice/ice_hash.c rename to drivers/net/intel/ice/ice_hash.c diff --git a/drivers/net/ice/ice_logs.h b/drivers/net/intel/ice/ice_logs.h similarity index 100% rename from drivers/net/ice/ice_logs.h rename to drivers/net/intel/ice/ice_logs.h diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c similarity index 100% rename from drivers/net/ice/ice_rxtx.c rename to drivers/net/intel/ice/ice_rxtx.c diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h similarity index 100% rename from drivers/net/ice/ice_rxtx.h rename to drivers/net/intel/ice/ice_rxtx.h diff --git a/drivers/net/ice/ice_rxtx_common_avx.h b/drivers/net/intel/ice/ice_rxtx_common_avx.h similarity index 100% rename from drivers/net/ice/ice_rxtx_common_avx.h rename to drivers/net/intel/ice/ice_rxtx_common_avx.h diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/intel/ice/ice_rxtx_vec_avx2.c similarity index 100% rename from drivers/net/ice/ice_rxtx_vec_avx2.c rename to drivers/net/intel/ice/ice_rxtx_vec_avx2.c diff --git a/drivers/net/ice/ice_rxtx_vec_avx512.c b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c similarity index 100% rename from drivers/net/ice/ice_rxtx_vec_avx512.c rename to drivers/net/intel/ice/ice_rxtx_vec_avx512.c diff --git a/drivers/net/ice/ice_rxtx_vec_common.h b/drivers/net/intel/ice/ice_rxtx_vec_common.h similarity index 100% rename from drivers/net/ice/ice_rxtx_vec_common.h rename to drivers/net/intel/ice/ice_rxtx_vec_common.h diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/intel/ice/ice_rxtx_vec_sse.c similarity index 100% rename from drivers/net/ice/ice_rxtx_vec_sse.c rename to drivers/net/intel/ice/ice_rxtx_vec_sse.c diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/intel/ice/ice_switch_filter.c similarity index 100% rename from drivers/net/ice/ice_switch_filter.c rename to drivers/net/intel/ice/ice_switch_filter.c diff --git a/drivers/net/ice/ice_testpmd.c b/drivers/net/intel/ice/ice_testpmd.c similarity index 100% rename from drivers/net/ice/ice_testpmd.c rename to drivers/net/intel/ice/ice_testpmd.c diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/intel/ice/ice_tm.c similarity index 100% rename from drivers/net/ice/ice_tm.c rename to drivers/net/intel/ice/ice_tm.c diff --git a/drivers/net/ice/meson.build b/drivers/net/intel/ice/meson.build similarity index 96% rename from drivers/net/ice/meson.build rename to drivers/net/intel/ice/meson.build index 1c9dc0cc6d..beaf21e176 100644 --- a/drivers/net/ice/meson.build +++ b/drivers/net/intel/ice/meson.build @@ -19,7 +19,7 @@ sources = files( testpmd_sources = files('ice_testpmd.c') deps += ['hash', 'net', 'common_iavf'] -includes += include_directories('base', '../../common/iavf') +includes += include_directories('base') if arch_subdir == 'x86' sources += files('ice_rxtx_vec_sse.c') diff --git a/drivers/net/ice/version.map b/drivers/net/intel/ice/version.map similarity index 100% rename from drivers/net/ice/version.map rename to drivers/net/intel/ice/version.map diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/intel/idpf/idpf_ethdev.c similarity index 100% rename from drivers/net/idpf/idpf_ethdev.c rename to drivers/net/intel/idpf/idpf_ethdev.c diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/intel/idpf/idpf_ethdev.h similarity index 100% rename from drivers/net/idpf/idpf_ethdev.h rename to drivers/net/intel/idpf/idpf_ethdev.h diff --git a/drivers/net/idpf/idpf_logs.h b/drivers/net/intel/idpf/idpf_logs.h similarity index 100% rename from drivers/net/idpf/idpf_logs.h rename to drivers/net/intel/idpf/idpf_logs.h diff --git a/drivers/net/idpf/idpf_rxtx.c b/drivers/net/intel/idpf/idpf_rxtx.c similarity index 100% rename from drivers/net/idpf/idpf_rxtx.c rename to drivers/net/intel/idpf/idpf_rxtx.c diff --git a/drivers/net/idpf/idpf_rxtx.h b/drivers/net/intel/idpf/idpf_rxtx.h similarity index 100% rename from drivers/net/idpf/idpf_rxtx.h rename to drivers/net/intel/idpf/idpf_rxtx.h diff --git a/drivers/net/idpf/idpf_rxtx_vec_common.h b/drivers/net/intel/idpf/idpf_rxtx_vec_common.h similarity index 100% rename from drivers/net/idpf/idpf_rxtx_vec_common.h rename to drivers/net/intel/idpf/idpf_rxtx_vec_common.h diff --git a/drivers/net/idpf/meson.build b/drivers/net/intel/idpf/meson.build similarity index 100% rename from drivers/net/idpf/meson.build rename to drivers/net/intel/idpf/meson.build diff --git a/drivers/net/igc/base/README b/drivers/net/intel/igc/base/README similarity index 100% rename from drivers/net/igc/base/README rename to drivers/net/intel/igc/base/README diff --git a/drivers/net/igc/base/igc_82571.h b/drivers/net/intel/igc/base/igc_82571.h similarity index 100% rename from drivers/net/igc/base/igc_82571.h rename to drivers/net/intel/igc/base/igc_82571.h diff --git a/drivers/net/igc/base/igc_82575.h b/drivers/net/intel/igc/base/igc_82575.h similarity index 100% rename from drivers/net/igc/base/igc_82575.h rename to drivers/net/intel/igc/base/igc_82575.h diff --git a/drivers/net/igc/base/igc_api.c b/drivers/net/intel/igc/base/igc_api.c similarity index 100% rename from drivers/net/igc/base/igc_api.c rename to drivers/net/intel/igc/base/igc_api.c diff --git a/drivers/net/igc/base/igc_api.h b/drivers/net/intel/igc/base/igc_api.h similarity index 100% rename from drivers/net/igc/base/igc_api.h rename to drivers/net/intel/igc/base/igc_api.h diff --git a/drivers/net/igc/base/igc_base.c b/drivers/net/intel/igc/base/igc_base.c similarity index 100% rename from drivers/net/igc/base/igc_base.c rename to drivers/net/intel/igc/base/igc_base.c diff --git a/drivers/net/igc/base/igc_base.h b/drivers/net/intel/igc/base/igc_base.h similarity index 100% rename from drivers/net/igc/base/igc_base.h rename to drivers/net/intel/igc/base/igc_base.h diff --git a/drivers/net/igc/base/igc_defines.h b/drivers/net/intel/igc/base/igc_defines.h similarity index 100% rename from drivers/net/igc/base/igc_defines.h rename to drivers/net/intel/igc/base/igc_defines.h diff --git a/drivers/net/igc/base/igc_hw.h b/drivers/net/intel/igc/base/igc_hw.h similarity index 100% rename from drivers/net/igc/base/igc_hw.h rename to drivers/net/intel/igc/base/igc_hw.h diff --git a/drivers/net/igc/base/igc_i225.c b/drivers/net/intel/igc/base/igc_i225.c similarity index 100% rename from drivers/net/igc/base/igc_i225.c rename to drivers/net/intel/igc/base/igc_i225.c diff --git a/drivers/net/igc/base/igc_i225.h b/drivers/net/intel/igc/base/igc_i225.h similarity index 100% rename from drivers/net/igc/base/igc_i225.h rename to drivers/net/intel/igc/base/igc_i225.h diff --git a/drivers/net/igc/base/igc_ich8lan.h b/drivers/net/intel/igc/base/igc_ich8lan.h similarity index 100% rename from drivers/net/igc/base/igc_ich8lan.h rename to drivers/net/intel/igc/base/igc_ich8lan.h diff --git a/drivers/net/igc/base/igc_mac.c b/drivers/net/intel/igc/base/igc_mac.c similarity index 100% rename from drivers/net/igc/base/igc_mac.c rename to drivers/net/intel/igc/base/igc_mac.c diff --git a/drivers/net/igc/base/igc_mac.h b/drivers/net/intel/igc/base/igc_mac.h similarity index 100% rename from drivers/net/igc/base/igc_mac.h rename to drivers/net/intel/igc/base/igc_mac.h diff --git a/drivers/net/igc/base/igc_manage.c b/drivers/net/intel/igc/base/igc_manage.c similarity index 100% rename from drivers/net/igc/base/igc_manage.c rename to drivers/net/intel/igc/base/igc_manage.c diff --git a/drivers/net/igc/base/igc_manage.h b/drivers/net/intel/igc/base/igc_manage.h similarity index 100% rename from drivers/net/igc/base/igc_manage.h rename to drivers/net/intel/igc/base/igc_manage.h diff --git a/drivers/net/igc/base/igc_nvm.c b/drivers/net/intel/igc/base/igc_nvm.c similarity index 100% rename from drivers/net/igc/base/igc_nvm.c rename to drivers/net/intel/igc/base/igc_nvm.c diff --git a/drivers/net/igc/base/igc_nvm.h b/drivers/net/intel/igc/base/igc_nvm.h similarity index 100% rename from drivers/net/igc/base/igc_nvm.h rename to drivers/net/intel/igc/base/igc_nvm.h diff --git a/drivers/net/igc/base/igc_osdep.c b/drivers/net/intel/igc/base/igc_osdep.c similarity index 100% rename from drivers/net/igc/base/igc_osdep.c rename to drivers/net/intel/igc/base/igc_osdep.c diff --git a/drivers/net/igc/base/igc_osdep.h b/drivers/net/intel/igc/base/igc_osdep.h similarity index 100% rename from drivers/net/igc/base/igc_osdep.h rename to drivers/net/intel/igc/base/igc_osdep.h diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/intel/igc/base/igc_phy.c similarity index 100% rename from drivers/net/igc/base/igc_phy.c rename to drivers/net/intel/igc/base/igc_phy.c diff --git a/drivers/net/igc/base/igc_phy.h b/drivers/net/intel/igc/base/igc_phy.h similarity index 100% rename from drivers/net/igc/base/igc_phy.h rename to drivers/net/intel/igc/base/igc_phy.h diff --git a/drivers/net/igc/base/igc_regs.h b/drivers/net/intel/igc/base/igc_regs.h similarity index 100% rename from drivers/net/igc/base/igc_regs.h rename to drivers/net/intel/igc/base/igc_regs.h diff --git a/drivers/net/igc/base/meson.build b/drivers/net/intel/igc/base/meson.build similarity index 100% rename from drivers/net/igc/base/meson.build rename to drivers/net/intel/igc/base/meson.build diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/intel/igc/igc_ethdev.c similarity index 100% rename from drivers/net/igc/igc_ethdev.c rename to drivers/net/intel/igc/igc_ethdev.c diff --git a/drivers/net/igc/igc_ethdev.h b/drivers/net/intel/igc/igc_ethdev.h similarity index 100% rename from drivers/net/igc/igc_ethdev.h rename to drivers/net/intel/igc/igc_ethdev.h diff --git a/drivers/net/igc/igc_filter.c b/drivers/net/intel/igc/igc_filter.c similarity index 100% rename from drivers/net/igc/igc_filter.c rename to drivers/net/intel/igc/igc_filter.c diff --git a/drivers/net/igc/igc_filter.h b/drivers/net/intel/igc/igc_filter.h similarity index 100% rename from drivers/net/igc/igc_filter.h rename to drivers/net/intel/igc/igc_filter.h diff --git a/drivers/net/igc/igc_flow.c b/drivers/net/intel/igc/igc_flow.c similarity index 100% rename from drivers/net/igc/igc_flow.c rename to drivers/net/intel/igc/igc_flow.c diff --git a/drivers/net/igc/igc_flow.h b/drivers/net/intel/igc/igc_flow.h similarity index 100% rename from drivers/net/igc/igc_flow.h rename to drivers/net/intel/igc/igc_flow.h diff --git a/drivers/net/igc/igc_logs.c b/drivers/net/intel/igc/igc_logs.c similarity index 100% rename from drivers/net/igc/igc_logs.c rename to drivers/net/intel/igc/igc_logs.c diff --git a/drivers/net/igc/igc_logs.h b/drivers/net/intel/igc/igc_logs.h similarity index 100% rename from drivers/net/igc/igc_logs.h rename to drivers/net/intel/igc/igc_logs.h diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/intel/igc/igc_txrx.c similarity index 100% rename from drivers/net/igc/igc_txrx.c rename to drivers/net/intel/igc/igc_txrx.c diff --git a/drivers/net/igc/igc_txrx.h b/drivers/net/intel/igc/igc_txrx.h similarity index 100% rename from drivers/net/igc/igc_txrx.h rename to drivers/net/intel/igc/igc_txrx.h diff --git a/drivers/net/igc/meson.build b/drivers/net/intel/igc/meson.build similarity index 100% rename from drivers/net/igc/meson.build rename to drivers/net/intel/igc/meson.build diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.c similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_ethdev.c rename to drivers/net/intel/ipn3ke/ipn3ke_ethdev.c diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.h b/drivers/net/intel/ipn3ke/ipn3ke_ethdev.h similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_ethdev.h rename to drivers/net/intel/ipn3ke/ipn3ke_ethdev.h diff --git a/drivers/net/ipn3ke/ipn3ke_flow.c b/drivers/net/intel/ipn3ke/ipn3ke_flow.c similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_flow.c rename to drivers/net/intel/ipn3ke/ipn3ke_flow.c diff --git a/drivers/net/ipn3ke/ipn3ke_flow.h b/drivers/net/intel/ipn3ke/ipn3ke_flow.h similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_flow.h rename to drivers/net/intel/ipn3ke/ipn3ke_flow.h diff --git a/drivers/net/ipn3ke/ipn3ke_logs.h b/drivers/net/intel/ipn3ke/ipn3ke_logs.h similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_logs.h rename to drivers/net/intel/ipn3ke/ipn3ke_logs.h diff --git a/drivers/net/ipn3ke/ipn3ke_rawdev_api.h b/drivers/net/intel/ipn3ke/ipn3ke_rawdev_api.h similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_rawdev_api.h rename to drivers/net/intel/ipn3ke/ipn3ke_rawdev_api.h diff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/intel/ipn3ke/ipn3ke_representor.c similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_representor.c rename to drivers/net/intel/ipn3ke/ipn3ke_representor.c diff --git a/drivers/net/ipn3ke/ipn3ke_tm.c b/drivers/net/intel/ipn3ke/ipn3ke_tm.c similarity index 100% rename from drivers/net/ipn3ke/ipn3ke_tm.c rename to drivers/net/intel/ipn3ke/ipn3ke_tm.c diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/intel/ipn3ke/meson.build similarity index 91% rename from drivers/net/ipn3ke/meson.build rename to drivers/net/intel/ipn3ke/meson.build index 464bdbd8b6..23c4d36b4f 100644 --- a/drivers/net/ipn3ke/meson.build +++ b/drivers/net/intel/ipn3ke/meson.build @@ -21,7 +21,7 @@ if not has_libfdt subdir_done() endif -includes += include_directories('../../raw/ifpga') +includes += include_directories('../../../raw/ifpga') sources += files( 'ipn3ke_ethdev.c', diff --git a/drivers/net/ipn3ke/version.map b/drivers/net/intel/ipn3ke/version.map similarity index 100% rename from drivers/net/ipn3ke/version.map rename to drivers/net/intel/ipn3ke/version.map diff --git a/drivers/net/ixgbe/base/README b/drivers/net/intel/ixgbe/base/README similarity index 100% rename from drivers/net/ixgbe/base/README rename to drivers/net/intel/ixgbe/base/README diff --git a/drivers/net/ixgbe/base/ixgbe_82598.c b/drivers/net/intel/ixgbe/base/ixgbe_82598.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_82598.c rename to drivers/net/intel/ixgbe/base/ixgbe_82598.c diff --git a/drivers/net/ixgbe/base/ixgbe_82598.h b/drivers/net/intel/ixgbe/base/ixgbe_82598.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_82598.h rename to drivers/net/intel/ixgbe/base/ixgbe_82598.h diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/intel/ixgbe/base/ixgbe_82599.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_82599.c rename to drivers/net/intel/ixgbe/base/ixgbe_82599.c diff --git a/drivers/net/ixgbe/base/ixgbe_82599.h b/drivers/net/intel/ixgbe/base/ixgbe_82599.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_82599.h rename to drivers/net/intel/ixgbe/base/ixgbe_82599.h diff --git a/drivers/net/ixgbe/base/ixgbe_api.c b/drivers/net/intel/ixgbe/base/ixgbe_api.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_api.c rename to drivers/net/intel/ixgbe/base/ixgbe_api.c diff --git a/drivers/net/ixgbe/base/ixgbe_api.h b/drivers/net/intel/ixgbe/base/ixgbe_api.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_api.h rename to drivers/net/intel/ixgbe/base/ixgbe_api.h diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/intel/ixgbe/base/ixgbe_common.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_common.c rename to drivers/net/intel/ixgbe/base/ixgbe_common.c diff --git a/drivers/net/ixgbe/base/ixgbe_common.h b/drivers/net/intel/ixgbe/base/ixgbe_common.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_common.h rename to drivers/net/intel/ixgbe/base/ixgbe_common.h diff --git a/drivers/net/ixgbe/base/ixgbe_dcb.c b/drivers/net/intel/ixgbe/base/ixgbe_dcb.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_dcb.c rename to drivers/net/intel/ixgbe/base/ixgbe_dcb.c diff --git a/drivers/net/ixgbe/base/ixgbe_dcb.h b/drivers/net/intel/ixgbe/base/ixgbe_dcb.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_dcb.h rename to drivers/net/intel/ixgbe/base/ixgbe_dcb.h diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c b/drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_dcb_82598.c rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.c diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.h b/drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_dcb_82598.h rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82598.h diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c b/drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_dcb_82599.c rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.c diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.h b/drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_dcb_82599.h rename to drivers/net/intel/ixgbe/base/ixgbe_dcb_82599.h diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c b/drivers/net/intel/ixgbe/base/ixgbe_e610.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_e610.c rename to drivers/net/intel/ixgbe/base/ixgbe_e610.c diff --git a/drivers/net/ixgbe/base/ixgbe_e610.h b/drivers/net/intel/ixgbe/base/ixgbe_e610.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_e610.h rename to drivers/net/intel/ixgbe/base/ixgbe_e610.h diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c b/drivers/net/intel/ixgbe/base/ixgbe_hv_vf.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_hv_vf.c rename to drivers/net/intel/ixgbe/base/ixgbe_hv_vf.c diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.h b/drivers/net/intel/ixgbe/base/ixgbe_hv_vf.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_hv_vf.h rename to drivers/net/intel/ixgbe/base/ixgbe_hv_vf.h diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.c b/drivers/net/intel/ixgbe/base/ixgbe_mbx.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_mbx.c rename to drivers/net/intel/ixgbe/base/ixgbe_mbx.c diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.h b/drivers/net/intel/ixgbe/base/ixgbe_mbx.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_mbx.h rename to drivers/net/intel/ixgbe/base/ixgbe_mbx.h diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.c b/drivers/net/intel/ixgbe/base/ixgbe_osdep.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_osdep.c rename to drivers/net/intel/ixgbe/base/ixgbe_osdep.c diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_osdep.h rename to drivers/net/intel/ixgbe/base/ixgbe_osdep.h diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/intel/ixgbe/base/ixgbe_phy.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_phy.c rename to drivers/net/intel/ixgbe/base/ixgbe_phy.c diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/intel/ixgbe/base/ixgbe_phy.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_phy.h rename to drivers/net/intel/ixgbe/base/ixgbe_phy.h diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/intel/ixgbe/base/ixgbe_type.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_type.h rename to drivers/net/intel/ixgbe/base/ixgbe_type.h diff --git a/drivers/net/ixgbe/base/ixgbe_type_e610.h b/drivers/net/intel/ixgbe/base/ixgbe_type_e610.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_type_e610.h rename to drivers/net/intel/ixgbe/base/ixgbe_type_e610.h diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/intel/ixgbe/base/ixgbe_vf.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_vf.c rename to drivers/net/intel/ixgbe/base/ixgbe_vf.c diff --git a/drivers/net/ixgbe/base/ixgbe_vf.h b/drivers/net/intel/ixgbe/base/ixgbe_vf.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_vf.h rename to drivers/net/intel/ixgbe/base/ixgbe_vf.h diff --git a/drivers/net/ixgbe/base/ixgbe_x540.c b/drivers/net/intel/ixgbe/base/ixgbe_x540.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_x540.c rename to drivers/net/intel/ixgbe/base/ixgbe_x540.c diff --git a/drivers/net/ixgbe/base/ixgbe_x540.h b/drivers/net/intel/ixgbe/base/ixgbe_x540.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_x540.h rename to drivers/net/intel/ixgbe/base/ixgbe_x540.h diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/intel/ixgbe/base/ixgbe_x550.c similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_x550.c rename to drivers/net/intel/ixgbe/base/ixgbe_x550.c diff --git a/drivers/net/ixgbe/base/ixgbe_x550.h b/drivers/net/intel/ixgbe/base/ixgbe_x550.h similarity index 100% rename from drivers/net/ixgbe/base/ixgbe_x550.h rename to drivers/net/intel/ixgbe/base/ixgbe_x550.h diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/intel/ixgbe/base/meson.build similarity index 100% rename from drivers/net/ixgbe/base/meson.build rename to drivers/net/intel/ixgbe/base/meson.build diff --git a/drivers/net/ixgbe/ixgbe_82599_bypass.c b/drivers/net/intel/ixgbe/ixgbe_82599_bypass.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_82599_bypass.c rename to drivers/net/intel/ixgbe/ixgbe_82599_bypass.c diff --git a/drivers/net/ixgbe/ixgbe_bypass.c b/drivers/net/intel/ixgbe/ixgbe_bypass.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_bypass.c rename to drivers/net/intel/ixgbe/ixgbe_bypass.c diff --git a/drivers/net/ixgbe/ixgbe_bypass.h b/drivers/net/intel/ixgbe/ixgbe_bypass.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_bypass.h rename to drivers/net/intel/ixgbe/ixgbe_bypass.h diff --git a/drivers/net/ixgbe/ixgbe_bypass_api.h b/drivers/net/intel/ixgbe/ixgbe_bypass_api.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_bypass_api.h rename to drivers/net/intel/ixgbe/ixgbe_bypass_api.h diff --git a/drivers/net/ixgbe/ixgbe_bypass_defines.h b/drivers/net/intel/ixgbe/ixgbe_bypass_defines.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_bypass_defines.h rename to drivers/net/intel/ixgbe/ixgbe_bypass_defines.h diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_ethdev.c rename to drivers/net/intel/ixgbe/ixgbe_ethdev.c diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/intel/ixgbe/ixgbe_ethdev.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_ethdev.h rename to drivers/net/intel/ixgbe/ixgbe_ethdev.h diff --git a/drivers/net/ixgbe/ixgbe_fdir.c b/drivers/net/intel/ixgbe/ixgbe_fdir.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_fdir.c rename to drivers/net/intel/ixgbe/ixgbe_fdir.c diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_flow.c rename to drivers/net/intel/ixgbe/ixgbe_flow.c diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/intel/ixgbe/ixgbe_ipsec.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_ipsec.c rename to drivers/net/intel/ixgbe/ixgbe_ipsec.c diff --git a/drivers/net/ixgbe/ixgbe_ipsec.h b/drivers/net/intel/ixgbe/ixgbe_ipsec.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_ipsec.h rename to drivers/net/intel/ixgbe/ixgbe_ipsec.h diff --git a/drivers/net/ixgbe/ixgbe_logs.h b/drivers/net/intel/ixgbe/ixgbe_logs.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_logs.h rename to drivers/net/intel/ixgbe/ixgbe_logs.h diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/intel/ixgbe/ixgbe_pf.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_pf.c rename to drivers/net/intel/ixgbe/ixgbe_pf.c diff --git a/drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c b/drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_recycle_mbufs_vec_common.c rename to drivers/net/intel/ixgbe/ixgbe_recycle_mbufs_vec_common.c diff --git a/drivers/net/ixgbe/ixgbe_regs.h b/drivers/net/intel/ixgbe/ixgbe_regs.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_regs.h rename to drivers/net/intel/ixgbe/ixgbe_regs.h diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/intel/ixgbe/ixgbe_rxtx.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_rxtx.c rename to drivers/net/intel/ixgbe/ixgbe_rxtx.c diff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/intel/ixgbe/ixgbe_rxtx.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_rxtx.h rename to drivers/net/intel/ixgbe/ixgbe_rxtx.h diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h similarity index 100% rename from drivers/net/ixgbe/ixgbe_rxtx_vec_common.h rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c rename to drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c diff --git a/drivers/net/ixgbe/ixgbe_testpmd.c b/drivers/net/intel/ixgbe/ixgbe_testpmd.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_testpmd.c rename to drivers/net/intel/ixgbe/ixgbe_testpmd.c diff --git a/drivers/net/ixgbe/ixgbe_tm.c b/drivers/net/intel/ixgbe/ixgbe_tm.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_tm.c rename to drivers/net/intel/ixgbe/ixgbe_tm.c diff --git a/drivers/net/ixgbe/ixgbe_vf_representor.c b/drivers/net/intel/ixgbe/ixgbe_vf_representor.c similarity index 100% rename from drivers/net/ixgbe/ixgbe_vf_representor.c rename to drivers/net/intel/ixgbe/ixgbe_vf_representor.c diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/intel/ixgbe/meson.build similarity index 100% rename from drivers/net/ixgbe/meson.build rename to drivers/net/intel/ixgbe/meson.build diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.c similarity index 100% rename from drivers/net/ixgbe/rte_pmd_ixgbe.c rename to drivers/net/intel/ixgbe/rte_pmd_ixgbe.c diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/intel/ixgbe/rte_pmd_ixgbe.h similarity index 100% rename from drivers/net/ixgbe/rte_pmd_ixgbe.h rename to drivers/net/intel/ixgbe/rte_pmd_ixgbe.h diff --git a/drivers/net/ixgbe/version.map b/drivers/net/intel/ixgbe/version.map similarity index 100% rename from drivers/net/ixgbe/version.map rename to drivers/net/intel/ixgbe/version.map diff --git a/drivers/net/meson.build b/drivers/net/meson.build index dafd637ba4..02a3f5a0b6 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -13,28 +13,28 @@ drivers = [ 'bnxt', 'bonding', 'cnxk', - 'cpfl', 'cxgbe', 'dpaa', 'dpaa2', - 'e1000', 'ena', 'enetc', 'enetfec', 'enic', 'failsafe', - 'fm10k', 'gve', 'hinic', 'hns3', - 'i40e', - 'iavf', - 'ice', - 'idpf', - 'igc', + 'intel/cpfl', + 'intel/e1000', + 'intel/fm10k', + 'intel/i40e', + 'intel/iavf', + 'intel/ice', + 'intel/idpf', + 'intel/igc', + 'intel/ipn3ke', + 'intel/ixgbe', 'ionic', - 'ipn3ke', - 'ixgbe', 'mana', 'memif', 'mlx4', diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build index 20dea23206..444799cfb2 100644 --- a/drivers/raw/ifpga/meson.build +++ b/drivers/raw/ifpga/meson.build @@ -18,7 +18,5 @@ sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c', 'afu_pmd_he_hssi.c') includes += include_directories('base') -includes += include_directories('../../net/ipn3ke') -includes += include_directories('../../net/i40e') headers = files('rte_pmd_ifpga.h') diff --git a/usertools/dpdk-rss-flows.py b/usertools/dpdk-rss-flows.py index e5e7185884..b60cd18e7b 100755 --- a/usertools/dpdk-rss-flows.py +++ b/usertools/dpdk-rss-flows.py @@ -213,7 +213,7 @@ def reta_size(self, num_queues: int) -> int: key=bytes( ( # fmt: off - # rss_intel_key, see drivers/net/ixgbe/ixgbe_rxtx.c + # rss_intel_key, see drivers/net/intel/ixgbe/ixgbe_rxtx.c 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4, @@ -228,7 +228,7 @@ def reta_size(self, num_queues: int) -> int: key=bytes( ( # fmt: off - # rss_key_default, see drivers/net/i40e/i40e_ethdev.c + # rss_key_default, see drivers/net/intel/i40e/i40e_ethdev.c # i40e is the only driver that takes 52 bytes keys 0x44, 0x39, 0x79, 0x6b, 0xb5, 0x4c, 0x50, 0x23, 0xb6, 0x75, 0xea, 0x5b, 0x12, 0x4f, 0x9f, 0x30, -- 2.43.0