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 4B779A034F; Mon, 11 Oct 2021 11:58:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1176A410DA; Mon, 11 Oct 2021 11:58:33 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 1B2F640E0F for ; Mon, 11 Oct 2021 11:58:30 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10133"; a="287718565" X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="287718565" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 02:58:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="546973405" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga004.fm.intel.com with ESMTP; 11 Oct 2021 02:58:24 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 11 Oct 2021 02:58:23 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 11 Oct 2021 02:58:23 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.172) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 11 Oct 2021 02:58:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CAnFJSFpApR1WA7UlU4Pq6v6yZrrpBIYDYwWOsvOkHKfvHdq5rnBFCo7b3wF2TJMNoZ9toqzro18/sMFS50YUmQhIFGwALQU65586gp8jqiBylx1VqfEhrlCWTHQU1PkaBud8x1t2VfakLZrY1PYur+ohBrQPGtO2QK4pChmow6PguUkRq5kMG4ZqWF1QBMtOQVJ1uSSiTRMa1Guimrkgzo1AVv2ceiZhMqBjQ0w+pgjpQOdy47AqgGwUDUWctr0YoiLYs/4kon6JHlTn3RyVW3Rl3HDSrzmOlxxiNG8ZC5BrK3YCjqrRn08hl4kDbbX83g2dw0t1XMaBL8OmzQ2rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JVTv+Jq6GjaEJNpO7QqmAJWuvgWZfCQfNLJWIlq6KQ0=; b=cM/9XVd7RqyA1qbT3IO7OK88i2YBklfbhJBhzQmXqJ3amaByNluPo2LoqLS6Bwz6D6b0CwkPJPmuTs96IIqn6zQ/wSz0TM3nO1HrGKoAv0BhUqFRuqP+/5C9W8oxKMdLypd0Z0MYZUE7fYSalphWJxl4FSijfmcs39aFG2vDlLSgYqiZpsYDhfMq9uZH4dkFSf/nD2CIBEuiCopyLGsuGF01xSE+K7y06mPKcNP9x6szrS4uwl3yCt5lN2qgwFfW4lD5xg5RACn4T6wL7x2X5fe8IXcNFFBFi3mx/8BWr4Ct7kHzwTmsCiHZP36OoT0yAPfsqndqtpHd75ol6VR5iQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JVTv+Jq6GjaEJNpO7QqmAJWuvgWZfCQfNLJWIlq6KQ0=; b=oZTRjSyhG03NjSat71eF3ov2Ol6/mNocwFT60CEKey2g/axigY9UraHvCWiKx0RHIs8T8BKYeA/0zfhRJRhMyQXx/aRHe5ihZwDP6pHeQEE8k3IhDlhcagrRUrK/IwnS1jxEqbvxKO+RoVvlim1PWvDXAnrDfrUmUoyPL3GBIT0= Received: from PH0PR11MB4824.namprd11.prod.outlook.com (2603:10b6:510:38::13) by PH0PR11MB5048.namprd11.prod.outlook.com (2603:10b6:510:3d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Mon, 11 Oct 2021 09:58:20 +0000 Received: from PH0PR11MB4824.namprd11.prod.outlook.com ([fe80::5d01:114c:73be:1a19]) by PH0PR11MB4824.namprd11.prod.outlook.com ([fe80::5d01:114c:73be:1a19%8]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 09:58:20 +0000 From: "Gujjar, Abhinandan S" To: "pbhagavatula@marvell.com" , "jerinj@marvell.com" , "Jayatheerthan, Jay" CC: "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v3 09/14] eventdev: remove rte prefix for internal structs Thread-Index: AQHXun6shnZUKmpP2UWMoIixGYTvgKvNl+Tw Date: Mon, 11 Oct 2021 09:58:20 +0000 Message-ID: References: <20211003082710.8398-1-pbhagavatula@marvell.com> <20211006065012.16508-1-pbhagavatula@marvell.com> <20211006065012.16508-9-pbhagavatula@marvell.com> In-Reply-To: <20211006065012.16508-9-pbhagavatula@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.200.16 authentication-results: marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7f31ef6a-ff13-4d1f-3a5d-08d98c9da81e x-ms-traffictypediagnostic: PH0PR11MB5048: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xCoc928yGOoyWlPD8ebafC/50yJrjHpN4AtelWB3NGJN/vahzyV9rO+jPin/3ccDsmnEqpJqiiUmkm8FzC/zsu/b0khUsvXOH0qTTfs2M8+7tkLQTrcZ517BkO04b8rb6qlm0VWAUxbHrBwZMWn6KsK9WwCi5QUg3V3RBM83kFjPqbsRhJr5l3YV6421mTp/lgIuuR/fL0SneGkCG0oD54C1Mu3EqZyCtW6PwWpL+sTeB1YqWOC+pzObcbQY4ifxb4Sj91C8zoAdBt6XCRA0iJtyQlprRZajfEajeBSeAhfh2oyOo33EcDzMORym0365bMcIWfrswIKXSHBudNsLu6huCmVnK8ngfoA8a6ckxZJbo3NUU+KumPHdiSLF68RKrfH2BLq9ZQc5ev3catred2Zae6S+2rF0Z2FCLYE+x3LKyi1YtCZNDKe3gjvYyUFEJ4Zi1MYqwVVog+5RANdRw3LrpKfZxVliBz2lTvzM3trjhQtijAZzDxi5yW/wHpexcguJRCJE9okYZXyTT6slO9oV1gUuuTg9OrAnPpqO0iMccchm8TbGljWEmD2jNq8Y05iMn2u7UYUVX5kAT+TDOODHA9bfF/ptmbtDLN7AVrmVHnq9s+nuuqCl4wsYXT7pc0/L3Pqni1NquiLatxARpaIsKOEvCXV0WZWhuPow+R9mXEbrtrzGqXi+KmWpTW8LMAtJiOL/BmJUUPhlK7TKRdv3c2kMLVuQFUgkXw1frmv2NZ7xlkjIOiuRd17K3cpQvF+mAuFvJ1rOpVfyL8exC9bSar5N+Pw1rgZrCvLKF7nWsYlcE48IEPZyBj7/714P x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB4824.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(6636002)(122000001)(110136005)(2906002)(55016002)(30864003)(316002)(9686003)(33656002)(5660300002)(83380400001)(38100700002)(38070700005)(8676002)(26005)(66446008)(86362001)(6506007)(508600001)(66946007)(53546011)(64756008)(66476007)(4326008)(66556008)(7696005)(966005)(71200400001)(186003)(8936002)(76116006)(52536014)(579004)(559001)(309714004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Kp1JJ2HUuHKDahSUm+ouCxfaNhssXRzQpVdMNaB7k8SkvFnbN6trLWsyghId?= =?us-ascii?Q?6adkkbxG/jRT77YONyj3s9jLglpe8zxBh+/wgbriRXZBoiH3xYCJjHW1fJ4O?= =?us-ascii?Q?BXEODxV107Mq2tq7aV94uT+wDsUg2HWEQ/N0tGGi6OOoKW/0m7Ybb3kbWLi0?= =?us-ascii?Q?SJT2H51IDk3dx9Yl6h1a9oMa3gEb9LBUlEQ47pnOjFGJLtiU2dO1xZh5p7oU?= =?us-ascii?Q?+KKB60YMnx3vgq+uL3pGzz5+sz+yVZWja5ox3mf15OrToci8/80KiqRNCv5l?= =?us-ascii?Q?mlCU/scNXwgcR7IVLo9MW9C/uRcML71PJ8gi7J0M7MmBh9nTsrUFRE5VyWAP?= =?us-ascii?Q?rbT51QyrSbXR9aAy6jKm1J594P4Cn1N9mmdOlRN/QE77bK9clRSdkS5p86ZC?= =?us-ascii?Q?Cmikd09L3ePTixCcHHpTTP7eTfR33u9cwLFgP6JoboAh8rA3LGSgF2TcSozo?= =?us-ascii?Q?Rer7I5Yvxo3pd7gR9S4dYmaxBuL3qX9f81+eL7HVF+RIsU1Yl5eDV7oxiOFg?= =?us-ascii?Q?dEHKmYah0ep24UFTNL7UmDi1U4/AN4TEqi9Ogs96yTXKu3+LTo4MaeJYmY0w?= =?us-ascii?Q?8zZICPFCo196vhEpZ5bCIc4m+XX4CxN3fP3YXnU0qlmg7oxPctRgz+BNdsBE?= =?us-ascii?Q?g3ryU8fHuIA+HtF2eUZ1GFB1VAXE5YP5wTmYx6eQB5Gm/LYwMy/2l7ZZAJCv?= =?us-ascii?Q?1MNGIAQXX1DGOvlqDCN8gMMPq+Jcz/yaAAQqPZtm4wThF5VGZ4ukOuEycjvE?= =?us-ascii?Q?Cy0kcLz/G3IA+e09UBn9yL6PxBmnNJa6HK7OUX0THmlZUUj1WH8wMpm/dCTx?= =?us-ascii?Q?jXYHEciE6g+icagxRr4zo9fVeRKEydUffW76IlBzWTd3fkSCUqy7Fm7QC3GH?= =?us-ascii?Q?ABSWN9LyTUMn+nRngOyuLoWvx0ZU4GiWVyiwk2t/TE5OY+Ek8QMcjJ552BjB?= =?us-ascii?Q?wtwjZYEUS7bAaSfw64fQxsyNB1or1XpYwiW2LJ7Wvkwvhah9HFJL9CeIXl6A?= =?us-ascii?Q?1LuEn8OoPnMs9qrQlfxYX1BCMAXzvfwYcMLNwZTmuZJPqxgyPW7je7I+vXhp?= =?us-ascii?Q?MTOoWx+/l/Y7Ct8WtN139UgFkaXK6nsxqRJn0pwSeaoBuiCJyZXaXsp4hXKK?= =?us-ascii?Q?ZxZpqddMy0xSjWCGcVicII6nbZCYY6azArPEemEjVDFEzKXll8G7cXUemGAl?= =?us-ascii?Q?0f+zh1Rg+qZ6EC4Z6rF403PPYBhpb/iju1aOjZHHykQbVdRjqxJX/ffzMTLs?= =?us-ascii?Q?JDLPdsrHOZ4GXb/c37rILyFigmt1sJOgWeFCjwhptp9eJxGdIPL97x4CMFhI?= =?us-ascii?Q?twq62Qvqvq9qdA2hQveCRwnm?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4824.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f31ef6a-ff13-4d1f-3a5d-08d98c9da81e X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2021 09:58:20.6469 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Sth5lGZ4dw3H74cHPTNUGBQBm8ahbe7F4XFlp1XTvlJzKvU5mjFYcWiI8fvXCPHOIGapneIsnfdCncGqI6qhILqy4jvCQeFdExr577MzTI8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5048 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v3 09/14] eventdev: remove rte prefix for internal structs 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 Sender: "dev" Acked-by: Abhinandan Gujjar > -----Original Message----- > From: pbhagavatula@marvell.com > Sent: Wednesday, October 6, 2021 12:20 PM > To: jerinj@marvell.com; Gujjar, Abhinandan S > ; Jayatheerthan, Jay > > Cc: dev@dpdk.org; Pavan Nikhilesh > Subject: [dpdk-dev] [PATCH v3 09/14] eventdev: remove rte prefix for > internal structs >=20 > From: Pavan Nikhilesh >=20 > Remove rte_ prefix from rte_eth_event_enqueue_buffer, > rte_event_eth_rx_adapter and rte_event_crypto_adapter as they are only > used in rte_event_eth_rx_adapter.c and rte_event_crypto_adapter.c >=20 > Signed-off-by: Pavan Nikhilesh > Acked-by: Jay Jayatheerthan > --- > lib/eventdev/rte_event_crypto_adapter.c | 66 +++---- > lib/eventdev/rte_event_eth_rx_adapter.c | 249 ++++++++++-------------- > lib/eventdev/rte_eventdev.h | 2 +- > 3 files changed, 141 insertions(+), 176 deletions(-) >=20 > diff --git a/lib/eventdev/rte_event_crypto_adapter.c > b/lib/eventdev/rte_event_crypto_adapter.c > index ebfc8326a8..e9e660a3d2 100644 > --- a/lib/eventdev/rte_event_crypto_adapter.c > +++ b/lib/eventdev/rte_event_crypto_adapter.c > @@ -30,7 +30,7 @@ > */ > #define CRYPTO_ENQ_FLUSH_THRESHOLD 1024 >=20 > -struct rte_event_crypto_adapter { > +struct event_crypto_adapter { > /* Event device identifier */ > uint8_t eventdev_id; > /* Event port identifier */ > @@ -99,7 +99,7 @@ struct crypto_queue_pair_info { > uint8_t len; > } __rte_cache_aligned; >=20 > -static struct rte_event_crypto_adapter **event_crypto_adapter; > +static struct event_crypto_adapter **event_crypto_adapter; >=20 > /* Macros to check for valid adapter */ #define > EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, retval) do { \ @@ - > 141,7 +141,7 @@ eca_init(void) > return 0; > } >=20 > -static inline struct rte_event_crypto_adapter * > +static inline struct event_crypto_adapter * > eca_id_to_adapter(uint8_t id) > { > return event_crypto_adapter ? > @@ -158,7 +158,7 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id, > int started; > int ret; > struct rte_event_port_conf *port_conf =3D arg; > - struct rte_event_crypto_adapter *adapter =3D eca_id_to_adapter(id); > + struct event_crypto_adapter *adapter =3D eca_id_to_adapter(id); >=20 > if (adapter =3D=3D NULL) > return -EINVAL; > @@ -202,7 +202,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, > uint8_t dev_id, > enum rte_event_crypto_adapter_mode > mode, > void *conf_arg) > { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; > char mem_name[CRYPTO_ADAPTER_NAME_LEN]; > struct rte_event_dev_info dev_info; > int socket_id; > @@ -304,7 +304,7 @@ rte_event_crypto_adapter_create(uint8_t id, uint8_t > dev_id, int rte_event_crypto_adapter_free(uint8_t id) { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; >=20 > EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); >=20 > @@ -329,8 +329,8 @@ rte_event_crypto_adapter_free(uint8_t id) } >=20 > static inline unsigned int > -eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter, > - struct rte_event *ev, unsigned int cnt) > +eca_enq_to_cryptodev(struct event_crypto_adapter *adapter, struct > rte_event *ev, > + unsigned int cnt) > { > struct rte_event_crypto_adapter_stats *stats =3D &adapter- > >crypto_stats; > union rte_event_crypto_metadata *m_data =3D NULL; @@ -420,7 > +420,7 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter > *adapter, } >=20 > static unsigned int > -eca_crypto_enq_flush(struct rte_event_crypto_adapter *adapter) > +eca_crypto_enq_flush(struct event_crypto_adapter *adapter) > { > struct rte_event_crypto_adapter_stats *stats =3D &adapter- > >crypto_stats; > struct crypto_device_info *curr_dev; > @@ -466,8 +466,8 @@ eca_crypto_enq_flush(struct > rte_event_crypto_adapter *adapter) } >=20 > static int > -eca_crypto_adapter_enq_run(struct rte_event_crypto_adapter *adapter, > - unsigned int max_enq) > +eca_crypto_adapter_enq_run(struct event_crypto_adapter *adapter, > + unsigned int max_enq) > { > struct rte_event_crypto_adapter_stats *stats =3D &adapter- > >crypto_stats; > struct rte_event ev[BATCH_SIZE]; > @@ -500,8 +500,8 @@ eca_crypto_adapter_enq_run(struct > rte_event_crypto_adapter *adapter, } >=20 > static inline void > -eca_ops_enqueue_burst(struct rte_event_crypto_adapter *adapter, > - struct rte_crypto_op **ops, uint16_t num) > +eca_ops_enqueue_burst(struct event_crypto_adapter *adapter, > + struct rte_crypto_op **ops, uint16_t num) > { > struct rte_event_crypto_adapter_stats *stats =3D &adapter- > >crypto_stats; > union rte_event_crypto_metadata *m_data =3D NULL; @@ -564,8 > +564,8 @@ eca_ops_enqueue_burst(struct rte_event_crypto_adapter > *adapter, } >=20 > static inline unsigned int > -eca_crypto_adapter_deq_run(struct rte_event_crypto_adapter *adapter, > - unsigned int max_deq) > +eca_crypto_adapter_deq_run(struct event_crypto_adapter *adapter, > + unsigned int max_deq) > { > struct rte_event_crypto_adapter_stats *stats =3D &adapter- > >crypto_stats; > struct crypto_device_info *curr_dev; > @@ -627,8 +627,8 @@ eca_crypto_adapter_deq_run(struct > rte_event_crypto_adapter *adapter, } >=20 > static void > -eca_crypto_adapter_run(struct rte_event_crypto_adapter *adapter, > - unsigned int max_ops) > +eca_crypto_adapter_run(struct event_crypto_adapter *adapter, > + unsigned int max_ops) > { > while (max_ops) { > unsigned int e_cnt, d_cnt; > @@ -648,7 +648,7 @@ eca_crypto_adapter_run(struct > rte_event_crypto_adapter *adapter, static int eca_service_func(void *ar= gs) > { > - struct rte_event_crypto_adapter *adapter =3D args; > + struct event_crypto_adapter *adapter =3D args; >=20 > if (rte_spinlock_trylock(&adapter->lock) =3D=3D 0) > return 0; > @@ -659,7 +659,7 @@ eca_service_func(void *args) } >=20 > static int > -eca_init_service(struct rte_event_crypto_adapter *adapter, uint8_t id) > +eca_init_service(struct event_crypto_adapter *adapter, uint8_t id) > { > struct rte_event_crypto_adapter_conf adapter_conf; > struct rte_service_spec service; > @@ -699,10 +699,9 @@ eca_init_service(struct rte_event_crypto_adapter > *adapter, uint8_t id) } >=20 > static void > -eca_update_qp_info(struct rte_event_crypto_adapter *adapter, > - struct crypto_device_info *dev_info, > - int32_t queue_pair_id, > - uint8_t add) > +eca_update_qp_info(struct event_crypto_adapter *adapter, > + struct crypto_device_info *dev_info, int32_t > queue_pair_id, > + uint8_t add) > { > struct crypto_queue_pair_info *qp_info; > int enabled; > @@ -729,9 +728,8 @@ eca_update_qp_info(struct > rte_event_crypto_adapter *adapter, } >=20 > static int > -eca_add_queue_pair(struct rte_event_crypto_adapter *adapter, > - uint8_t cdev_id, > - int queue_pair_id) > +eca_add_queue_pair(struct event_crypto_adapter *adapter, uint8_t > cdev_id, > + int queue_pair_id) > { > struct crypto_device_info *dev_info =3D &adapter->cdevs[cdev_id]; > struct crypto_queue_pair_info *qpairs; @@ -773,7 +771,7 @@ > rte_event_crypto_adapter_queue_pair_add(uint8_t id, > int32_t queue_pair_id, > const struct rte_event *event) > { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; > struct rte_eventdev *dev; > struct crypto_device_info *dev_info; > uint32_t cap; > @@ -889,7 +887,7 @@ int > rte_event_crypto_adapter_queue_pair_del(uint8_t id, uint8_t cdev_id, > int32_t queue_pair_id) > { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; > struct crypto_device_info *dev_info; > struct rte_eventdev *dev; > int ret; > @@ -975,7 +973,7 @@ rte_event_crypto_adapter_queue_pair_del(uint8_t > id, uint8_t cdev_id, static int eca_adapter_ctrl(uint8_t id, int start)= { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; > struct crypto_device_info *dev_info; > struct rte_eventdev *dev; > uint32_t i; > @@ -1017,7 +1015,7 @@ eca_adapter_ctrl(uint8_t id, int start) int > rte_event_crypto_adapter_start(uint8_t id) { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; >=20 > EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); > adapter =3D eca_id_to_adapter(id); > @@ -1039,7 +1037,7 @@ int > rte_event_crypto_adapter_stats_get(uint8_t id, > struct rte_event_crypto_adapter_stats > *stats) { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; > struct rte_event_crypto_adapter_stats dev_stats_sum =3D { 0 }; > struct rte_event_crypto_adapter_stats dev_stats; > struct rte_eventdev *dev; > @@ -1083,7 +1081,7 @@ rte_event_crypto_adapter_stats_get(uint8_t id, > int rte_event_crypto_adapter_stats_reset(uint8_t id) { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; > struct crypto_device_info *dev_info; > struct rte_eventdev *dev; > uint32_t i; > @@ -1111,7 +1109,7 @@ rte_event_crypto_adapter_stats_reset(uint8_t id) > int rte_event_crypto_adapter_service_id_get(uint8_t id, uint32_t > *service_id) { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; >=20 > EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); >=20 > @@ -1128,7 +1126,7 @@ rte_event_crypto_adapter_service_id_get(uint8_t > id, uint32_t *service_id) int > rte_event_crypto_adapter_event_port_get(uint8_t id, uint8_t > *event_port_id) { > - struct rte_event_crypto_adapter *adapter; > + struct event_crypto_adapter *adapter; >=20 > EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL); >=20 > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c > b/lib/eventdev/rte_event_eth_rx_adapter.c > index 13dfb28401..f8225ebd3d 100644 > --- a/lib/eventdev/rte_event_eth_rx_adapter.c > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c > @@ -78,14 +78,14 @@ struct eth_rx_vector_data { > TAILQ_HEAD(eth_rx_vector_data_list, eth_rx_vector_data); >=20 > /* Instance per adapter */ > -struct rte_eth_event_enqueue_buffer { > +struct eth_event_enqueue_buffer { > /* Count of events in this buffer */ > uint16_t count; > /* Array of events in this buffer */ > struct rte_event events[ETH_EVENT_BUFFER_SIZE]; }; >=20 > -struct rte_event_eth_rx_adapter { > +struct event_eth_rx_adapter { > /* RSS key */ > uint8_t rss_key_be[RSS_KEY_SIZE]; > /* Event device identifier */ > @@ -109,7 +109,7 @@ struct rte_event_eth_rx_adapter { > /* Next entry in wrr[] to begin polling */ > uint32_t wrr_pos; > /* Event burst buffer */ > - struct rte_eth_event_enqueue_buffer event_enqueue_buffer; > + struct eth_event_enqueue_buffer event_enqueue_buffer; > /* Vector enable flag */ > uint8_t ena_vector; > /* Timestamp of previous vector expiry list traversal */ @@ -231,7 > +231,7 @@ struct eth_rx_queue_info { > struct eth_rx_vector_data vector_data; }; >=20 > -static struct rte_event_eth_rx_adapter **event_eth_rx_adapter; > +static struct event_eth_rx_adapter **event_eth_rx_adapter; >=20 > static inline int > rxa_validate_id(uint8_t id) > @@ -247,7 +247,7 @@ rxa_validate_id(uint8_t id) } while (0) >=20 > static inline int > -rxa_sw_adapter_queue_count(struct rte_event_eth_rx_adapter > *rx_adapter) > +rxa_sw_adapter_queue_count(struct event_eth_rx_adapter *rx_adapter) > { > return rx_adapter->num_rx_polled + rx_adapter->num_rx_intr; } > @@ -265,10 +265,9 @@ static uint16_t rxa_gcd_u16(uint16_t a, uint16_t b) > * http://kb.linuxvirtualserver.org/wiki/Weighted_Round-Robin_Scheduling > */ > static int > -rxa_wrr_next(struct rte_event_eth_rx_adapter *rx_adapter, > - unsigned int n, int *cw, > - struct eth_rx_poll_entry *eth_rx_poll, uint16_t max_wt, > - uint16_t gcd, int prev) > +rxa_wrr_next(struct event_eth_rx_adapter *rx_adapter, unsigned int n, > int *cw, > + struct eth_rx_poll_entry *eth_rx_poll, uint16_t max_wt, > + uint16_t gcd, int prev) > { > int i =3D prev; > uint16_t w; > @@ -373,10 +372,9 @@ rxa_nb_intr_vect(struct eth_device_info *dev_info, > int rx_queue_id, int add) > /* Calculate nb_rx_intr after deleting interrupt mode rx queues > */ > static void > -rxa_calc_nb_post_intr_del(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id, > - uint32_t *nb_rx_intr) > +rxa_calc_nb_post_intr_del(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id, > + uint32_t *nb_rx_intr) > { > uint32_t intr_diff; >=20 > @@ -392,12 +390,10 @@ rxa_calc_nb_post_intr_del(struct > rte_event_eth_rx_adapter *rx_adapter, > * interrupt queues could currently be poll mode Rx queues > */ > static void > -rxa_calc_nb_post_add_intr(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id, > - uint32_t *nb_rx_poll, > - uint32_t *nb_rx_intr, > - uint32_t *nb_wrr) > +rxa_calc_nb_post_add_intr(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id, > + uint32_t *nb_rx_poll, uint32_t *nb_rx_intr, > + uint32_t *nb_wrr) > { > uint32_t intr_diff; > uint32_t poll_diff; > @@ -424,11 +420,9 @@ rxa_calc_nb_post_add_intr(struct > rte_event_eth_rx_adapter *rx_adapter, > * after deleting poll mode rx queues > */ > static void > -rxa_calc_nb_post_poll_del(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id, > - uint32_t *nb_rx_poll, > - uint32_t *nb_wrr) > +rxa_calc_nb_post_poll_del(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id, > + uint32_t *nb_rx_poll, uint32_t *nb_wrr) > { > uint32_t poll_diff; > uint32_t wrr_len_diff; > @@ -449,13 +443,10 @@ rxa_calc_nb_post_poll_del(struct > rte_event_eth_rx_adapter *rx_adapter, > /* Calculate nb_rx_* after adding poll mode rx queues > */ > static void > -rxa_calc_nb_post_add_poll(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id, > - uint16_t wt, > - uint32_t *nb_rx_poll, > - uint32_t *nb_rx_intr, > - uint32_t *nb_wrr) > +rxa_calc_nb_post_add_poll(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id, > + uint16_t wt, uint32_t *nb_rx_poll, > + uint32_t *nb_rx_intr, uint32_t *nb_wrr) > { > uint32_t intr_diff; > uint32_t poll_diff; > @@ -482,13 +473,10 @@ rxa_calc_nb_post_add_poll(struct > rte_event_eth_rx_adapter *rx_adapter, >=20 > /* Calculate nb_rx_* after adding rx_queue_id */ static void - > rxa_calc_nb_post_add(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id, > - uint16_t wt, > - uint32_t *nb_rx_poll, > - uint32_t *nb_rx_intr, > - uint32_t *nb_wrr) > +rxa_calc_nb_post_add(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id, > + uint16_t wt, uint32_t *nb_rx_poll, uint32_t *nb_rx_intr, > + uint32_t *nb_wrr) > { > if (wt !=3D 0) > rxa_calc_nb_post_add_poll(rx_adapter, dev_info, > rx_queue_id, @@ -500,12 +488,10 @@ rxa_calc_nb_post_add(struct > rte_event_eth_rx_adapter *rx_adapter, >=20 > /* Calculate nb_rx_* after deleting rx_queue_id */ static void - > rxa_calc_nb_post_del(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id, > - uint32_t *nb_rx_poll, > - uint32_t *nb_rx_intr, > - uint32_t *nb_wrr) > +rxa_calc_nb_post_del(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id, > + uint32_t *nb_rx_poll, uint32_t *nb_rx_intr, > + uint32_t *nb_wrr) > { > rxa_calc_nb_post_poll_del(rx_adapter, dev_info, rx_queue_id, > nb_rx_poll, > nb_wrr); > @@ -517,8 +503,7 @@ rxa_calc_nb_post_del(struct > rte_event_eth_rx_adapter *rx_adapter, > * Allocate the rx_poll array > */ > static struct eth_rx_poll_entry * > -rxa_alloc_poll(struct rte_event_eth_rx_adapter *rx_adapter, > - uint32_t num_rx_polled) > +rxa_alloc_poll(struct event_eth_rx_adapter *rx_adapter, uint32_t > +num_rx_polled) > { > size_t len; >=20 > @@ -534,7 +519,7 @@ rxa_alloc_poll(struct rte_event_eth_rx_adapter > *rx_adapter, > * Allocate the WRR array > */ > static uint32_t * > -rxa_alloc_wrr(struct rte_event_eth_rx_adapter *rx_adapter, int nb_wrr) > +rxa_alloc_wrr(struct event_eth_rx_adapter *rx_adapter, int nb_wrr) > { > size_t len; >=20 > @@ -547,11 +532,9 @@ rxa_alloc_wrr(struct rte_event_eth_rx_adapter > *rx_adapter, int nb_wrr) } >=20 > static int > -rxa_alloc_poll_arrays(struct rte_event_eth_rx_adapter *rx_adapter, > - uint32_t nb_poll, > - uint32_t nb_wrr, > - struct eth_rx_poll_entry **rx_poll, > - uint32_t **wrr_sched) > +rxa_alloc_poll_arrays(struct event_eth_rx_adapter *rx_adapter, uint32_t > nb_poll, > + uint32_t nb_wrr, struct eth_rx_poll_entry **rx_poll, > + uint32_t **wrr_sched) > { >=20 > if (nb_poll =3D=3D 0) { > @@ -576,9 +559,8 @@ rxa_alloc_poll_arrays(struct > rte_event_eth_rx_adapter *rx_adapter, >=20 > /* Precalculate WRR polling sequence for all queues in rx_adapter */ st= atic > void -rxa_calc_wrr_sequence(struct rte_event_eth_rx_adapter > *rx_adapter, > - struct eth_rx_poll_entry *rx_poll, > - uint32_t *rx_wrr) > +rxa_calc_wrr_sequence(struct event_eth_rx_adapter *rx_adapter, > + struct eth_rx_poll_entry *rx_poll, uint32_t *rx_wrr) > { > uint16_t d; > uint16_t q; > @@ -705,13 +687,13 @@ rxa_do_softrss(struct rte_mbuf *m, const uint8_t > *rss_key_be) } >=20 > static inline int > -rxa_enq_blocked(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_enq_blocked(struct event_eth_rx_adapter *rx_adapter) > { > return !!rx_adapter->enq_block_count; > } >=20 > static inline void > -rxa_enq_block_start_ts(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_enq_block_start_ts(struct event_eth_rx_adapter *rx_adapter) > { > if (rx_adapter->rx_enq_block_start_ts) > return; > @@ -724,8 +706,8 @@ rxa_enq_block_start_ts(struct > rte_event_eth_rx_adapter *rx_adapter) } >=20 > static inline void > -rxa_enq_block_end_ts(struct rte_event_eth_rx_adapter *rx_adapter, > - struct rte_event_eth_rx_adapter_stats *stats) > +rxa_enq_block_end_ts(struct event_eth_rx_adapter *rx_adapter, > + struct rte_event_eth_rx_adapter_stats *stats) > { > if (unlikely(!stats->rx_enq_start_ts)) > stats->rx_enq_start_ts =3D rte_get_tsc_cycles(); @@ -744,10 > +726,10 @@ rxa_enq_block_end_ts(struct rte_event_eth_rx_adapter > *rx_adapter, >=20 > /* Enqueue buffered events to event device */ static inline uint16_t - > rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_flush_event_buffer(struct event_eth_rx_adapter *rx_adapter) > { > - struct rte_eth_event_enqueue_buffer *buf =3D > - &rx_adapter->event_enqueue_buffer; > + struct eth_event_enqueue_buffer *buf =3D > + &rx_adapter->event_enqueue_buffer; > struct rte_event_eth_rx_adapter_stats *stats =3D &rx_adapter->stats; >=20 > if (!buf->count) > @@ -774,7 +756,7 @@ rxa_flush_event_buffer(struct > rte_event_eth_rx_adapter *rx_adapter) } >=20 > static inline void > -rxa_init_vector(struct rte_event_eth_rx_adapter *rx_adapter, > +rxa_init_vector(struct event_eth_rx_adapter *rx_adapter, > struct eth_rx_vector_data *vec) > { > vec->vector_ev->nb_elem =3D 0; > @@ -785,9 +767,9 @@ rxa_init_vector(struct rte_event_eth_rx_adapter > *rx_adapter, } >=20 > static inline uint16_t > -rxa_create_event_vector(struct rte_event_eth_rx_adapter *rx_adapter, > +rxa_create_event_vector(struct event_eth_rx_adapter *rx_adapter, > struct eth_rx_queue_info *queue_info, > - struct rte_eth_event_enqueue_buffer *buf, > + struct eth_event_enqueue_buffer *buf, > struct rte_mbuf **mbufs, uint16_t num) { > struct rte_event *ev =3D &buf->events[buf->count]; @@ -845,19 > +827,16 @@ rxa_create_event_vector(struct rte_event_eth_rx_adapter > *rx_adapter, } >=20 > static inline void > -rxa_buffer_mbufs(struct rte_event_eth_rx_adapter *rx_adapter, > - uint16_t eth_dev_id, > - uint16_t rx_queue_id, > - struct rte_mbuf **mbufs, > - uint16_t num) > +rxa_buffer_mbufs(struct event_eth_rx_adapter *rx_adapter, uint16_t > eth_dev_id, > + uint16_t rx_queue_id, struct rte_mbuf **mbufs, uint16_t > num) > { > uint32_t i; > struct eth_device_info *dev_info =3D > &rx_adapter- > >eth_devices[eth_dev_id]; > struct eth_rx_queue_info *eth_rx_queue_info =3D > &dev_info- > >rx_queue[rx_queue_id]; > - struct rte_eth_event_enqueue_buffer *buf =3D > - &rx_adapter- > >event_enqueue_buffer; > + struct eth_event_enqueue_buffer *buf =3D > + &rx_adapter->event_enqueue_buffer; > struct rte_event *ev =3D &buf->events[buf->count]; > uint64_t event =3D eth_rx_queue_info->event; > uint32_t flow_id_mask =3D eth_rx_queue_info->flow_id_mask; @@ - > 909,16 +888,13 @@ rxa_buffer_mbufs(struct rte_event_eth_rx_adapter > *rx_adapter, >=20 > /* Enqueue packets from to event buffer */ static inline ui= nt32_t > -rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter, > - uint16_t port_id, > - uint16_t queue_id, > - uint32_t rx_count, > - uint32_t max_rx, > - int *rxq_empty) > +rxa_eth_rx(struct event_eth_rx_adapter *rx_adapter, uint16_t port_id, > + uint16_t queue_id, uint32_t rx_count, uint32_t max_rx, > + int *rxq_empty) > { > struct rte_mbuf *mbufs[BATCH_SIZE]; > - struct rte_eth_event_enqueue_buffer *buf =3D > - &rx_adapter- > >event_enqueue_buffer; > + struct eth_event_enqueue_buffer *buf =3D > + &rx_adapter->event_enqueue_buffer; > struct rte_event_eth_rx_adapter_stats *stats =3D > &rx_adapter->stats; > uint16_t n; > @@ -953,8 +929,7 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter > *rx_adapter, } >=20 > static inline void > -rxa_intr_ring_enqueue(struct rte_event_eth_rx_adapter *rx_adapter, > - void *data) > +rxa_intr_ring_enqueue(struct event_eth_rx_adapter *rx_adapter, void > +*data) > { > uint16_t port_id; > uint16_t queue; > @@ -994,8 +969,8 @@ rxa_intr_ring_enqueue(struct > rte_event_eth_rx_adapter *rx_adapter, } >=20 > static int > -rxa_intr_ring_check_avail(struct rte_event_eth_rx_adapter *rx_adapter, > - uint32_t num_intr_vec) > +rxa_intr_ring_check_avail(struct event_eth_rx_adapter *rx_adapter, > + uint32_t num_intr_vec) > { > if (rx_adapter->num_intr_vec + num_intr_vec > > RTE_EVENT_ETH_INTR_RING_SIZE) { > @@ -1010,9 +985,9 @@ rxa_intr_ring_check_avail(struct > rte_event_eth_rx_adapter *rx_adapter, >=20 > /* Delete entries for (dev, queue) from the interrupt ring */ static vo= id - > rxa_intr_ring_del_entries(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - uint16_t rx_queue_id) > +rxa_intr_ring_del_entries(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, > + uint16_t rx_queue_id) > { > int i, n; > union queue_data qd; > @@ -1045,7 +1020,7 @@ rxa_intr_ring_del_entries(struct > rte_event_eth_rx_adapter *rx_adapter, static void * rxa_intr_thread(voi= d > *arg) { > - struct rte_event_eth_rx_adapter *rx_adapter =3D arg; > + struct event_eth_rx_adapter *rx_adapter =3D arg; > struct rte_epoll_event *epoll_events =3D rx_adapter->epoll_events; > int n, i; >=20 > @@ -1068,12 +1043,12 @@ rxa_intr_thread(void *arg) > * mbufs to eventdev > */ > static inline uint32_t > -rxa_intr_ring_dequeue(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter) > { > uint32_t n; > uint32_t nb_rx =3D 0; > int rxq_empty; > - struct rte_eth_event_enqueue_buffer *buf; > + struct eth_event_enqueue_buffer *buf; > rte_spinlock_t *ring_lock; > uint8_t max_done =3D 0; >=20 > @@ -1188,11 +1163,11 @@ rxa_intr_ring_dequeue(struct > rte_event_eth_rx_adapter *rx_adapter) > * it. > */ > static inline uint32_t > -rxa_poll(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_poll(struct event_eth_rx_adapter *rx_adapter) > { > uint32_t num_queue; > uint32_t nb_rx =3D 0; > - struct rte_eth_event_enqueue_buffer *buf; > + struct eth_event_enqueue_buffer *buf; > uint32_t wrr_pos; > uint32_t max_nb_rx; >=20 > @@ -1233,8 +1208,8 @@ rxa_poll(struct rte_event_eth_rx_adapter > *rx_adapter) static void rxa_vector_expire(struct eth_rx_vector_data *v= ec, > void *arg) { > - struct rte_event_eth_rx_adapter *rx_adapter =3D arg; > - struct rte_eth_event_enqueue_buffer *buf =3D > + struct event_eth_rx_adapter *rx_adapter =3D arg; > + struct eth_event_enqueue_buffer *buf =3D > &rx_adapter->event_enqueue_buffer; > struct rte_event *ev; >=20 > @@ -1257,7 +1232,7 @@ rxa_vector_expire(struct eth_rx_vector_data *vec, > void *arg) static int rxa_service_func(void *args) { > - struct rte_event_eth_rx_adapter *rx_adapter =3D args; > + struct event_eth_rx_adapter *rx_adapter =3D args; > struct rte_event_eth_rx_adapter_stats *stats; >=20 > if (rte_spinlock_trylock(&rx_adapter->rx_lock) =3D=3D 0) @@ -1318,7 > +1293,7 @@ rte_event_eth_rx_adapter_init(void) > return 0; > } >=20 > -static inline struct rte_event_eth_rx_adapter * > +static inline struct event_eth_rx_adapter * > rxa_id_to_adapter(uint8_t id) > { > return event_eth_rx_adapter ? > @@ -1335,7 +1310,7 @@ rxa_default_conf_cb(uint8_t id, uint8_t dev_id, > int started; > uint8_t port_id; > struct rte_event_port_conf *port_conf =3D arg; > - struct rte_event_eth_rx_adapter *rx_adapter =3D > rxa_id_to_adapter(id); > + struct event_eth_rx_adapter *rx_adapter =3D rxa_id_to_adapter(id); >=20 > dev =3D &rte_eventdevs[rx_adapter->eventdev_id]; > dev_conf =3D dev->data->dev_conf; > @@ -1384,7 +1359,7 @@ rxa_epoll_create1(void) } >=20 > static int > -rxa_init_epd(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_init_epd(struct event_eth_rx_adapter *rx_adapter) > { > if (rx_adapter->epd !=3D INIT_FD) > return 0; > @@ -1401,7 +1376,7 @@ rxa_init_epd(struct rte_event_eth_rx_adapter > *rx_adapter) } >=20 > static int > -rxa_create_intr_thread(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_create_intr_thread(struct event_eth_rx_adapter *rx_adapter) > { > int err; > char thread_name[RTE_MAX_THREAD_NAME_LEN]; > @@ -1445,7 +1420,7 @@ rxa_create_intr_thread(struct > rte_event_eth_rx_adapter *rx_adapter) } >=20 > static int > -rxa_destroy_intr_thread(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_destroy_intr_thread(struct event_eth_rx_adapter *rx_adapter) > { > int err; >=20 > @@ -1466,7 +1441,7 @@ rxa_destroy_intr_thread(struct > rte_event_eth_rx_adapter *rx_adapter) } >=20 > static int > -rxa_free_intr_resources(struct rte_event_eth_rx_adapter *rx_adapter) > +rxa_free_intr_resources(struct event_eth_rx_adapter *rx_adapter) > { > int ret; >=20 > @@ -1484,9 +1459,8 @@ rxa_free_intr_resources(struct > rte_event_eth_rx_adapter *rx_adapter) } >=20 > static int > -rxa_disable_intr(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - uint16_t rx_queue_id) > +rxa_disable_intr(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, uint16_t rx_queue_id) > { > int err; > uint16_t eth_dev_id =3D dev_info->dev->data->port_id; @@ -1514,9 > +1488,8 @@ rxa_disable_intr(struct rte_event_eth_rx_adapter > *rx_adapter, } >=20 > static int > -rxa_del_intr_queue(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id) > +rxa_del_intr_queue(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id) > { > int err; > int i; > @@ -1573,9 +1546,8 @@ rxa_del_intr_queue(struct > rte_event_eth_rx_adapter *rx_adapter, } >=20 > static int > -rxa_config_intr(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - uint16_t rx_queue_id) > +rxa_config_intr(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, uint16_t rx_queue_id) > { > int err, err1; > uint16_t eth_dev_id =3D dev_info->dev->data->port_id; @@ -1663,9 > +1635,8 @@ rxa_config_intr(struct rte_event_eth_rx_adapter *rx_adapter, > } >=20 > static int > -rxa_add_intr_queue(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int rx_queue_id) > +rxa_add_intr_queue(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int rx_queue_id) >=20 > { > int i, j, err; > @@ -1713,9 +1684,8 @@ rxa_add_intr_queue(struct > rte_event_eth_rx_adapter *rx_adapter, > return err; > } >=20 > - > static int > -rxa_init_service(struct rte_event_eth_rx_adapter *rx_adapter, uint8_t id= ) > +rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id) > { > int ret; > struct rte_service_spec service; > @@ -1758,10 +1728,9 @@ rxa_init_service(struct rte_event_eth_rx_adapter > *rx_adapter, uint8_t id) } >=20 > static void > -rxa_update_queue(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int32_t rx_queue_id, > - uint8_t add) > +rxa_update_queue(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int32_t rx_queue_id, > + uint8_t add) > { > struct eth_rx_queue_info *queue_info; > int enabled; > @@ -1811,9 +1780,8 @@ rxa_set_vector_data(struct eth_rx_queue_info > *queue_info, uint16_t vector_count, } >=20 > static void > -rxa_sw_del(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int32_t rx_queue_id) > +rxa_sw_del(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int32_t rx_queue_id) > { > struct eth_rx_vector_data *vec; > int pollq; > @@ -1854,10 +1822,9 @@ rxa_sw_del(struct rte_event_eth_rx_adapter > *rx_adapter, } >=20 > static void > -rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, > - struct eth_device_info *dev_info, > - int32_t rx_queue_id, > - const struct rte_event_eth_rx_adapter_queue_conf *conf) > +rxa_add_queue(struct event_eth_rx_adapter *rx_adapter, > + struct eth_device_info *dev_info, int32_t rx_queue_id, > + const struct rte_event_eth_rx_adapter_queue_conf *conf) > { > struct eth_rx_queue_info *queue_info; > const struct rte_event *ev =3D &conf->ev; @@ -1922,7 +1889,7 @@ > rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, >=20 > static void > rxa_sw_event_vector_configure( > - struct rte_event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, > + struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id, > int rx_queue_id, > const struct rte_event_eth_rx_adapter_event_vector_config > *config) { @@ -1956,10 +1923,10 @@ rxa_sw_event_vector_configure( > config->vector_timeout_ns >> 1; } >=20 > -static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter, > - uint16_t eth_dev_id, > - int rx_queue_id, > - const struct rte_event_eth_rx_adapter_queue_conf > *queue_conf) > +static int > +rxa_sw_add(struct event_eth_rx_adapter *rx_adapter, uint16_t > eth_dev_id, > + int rx_queue_id, > + const struct rte_event_eth_rx_adapter_queue_conf > *queue_conf) > { > struct eth_device_info *dev_info =3D &rx_adapter- > >eth_devices[eth_dev_id]; > struct rte_event_eth_rx_adapter_queue_conf temp_conf; @@ - > 2088,7 +2055,7 @@ static int rxa_sw_add(struct rte_event_eth_rx_adapter > *rx_adapter, static int rxa_ctrl(uint8_t id, int start) { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct rte_eventdev *dev; > struct eth_device_info *dev_info; > uint32_t i; > @@ -2135,7 +2102,7 @@ rte_event_eth_rx_adapter_create_ext(uint8_t id, > uint8_t dev_id, > rte_event_eth_rx_adapter_conf_cb > conf_cb, > void *conf_arg) > { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > int ret; > int socket_id; > uint16_t i; > @@ -2235,7 +2202,7 @@ rte_event_eth_rx_adapter_create(uint8_t id, > uint8_t dev_id, int rte_event_eth_rx_adapter_free(uint8_t id) { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; >=20 > RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, - > EINVAL); >=20 > @@ -2267,7 +2234,7 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, > { > int ret; > uint32_t cap; > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct rte_eventdev *dev; > struct eth_device_info *dev_info; >=20 > @@ -2385,7 +2352,7 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, > uint16_t eth_dev_id, { > int ret =3D 0; > struct rte_eventdev *dev; > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct eth_device_info *dev_info; > uint32_t cap; > uint32_t nb_rx_poll =3D 0; > @@ -2505,7 +2472,7 @@ > rte_event_eth_rx_adapter_queue_event_vector_config( > struct rte_event_eth_rx_adapter_event_vector_config *config) { > struct rte_event_eth_rx_adapter_vector_limits limits; > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct rte_eventdev *dev; > uint32_t cap; > int ret; > @@ -2632,7 +2599,7 @@ int > rte_event_eth_rx_adapter_stats_get(uint8_t id, > struct rte_event_eth_rx_adapter_stats *stats) { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct rte_event_eth_rx_adapter_stats dev_stats_sum =3D { 0 }; > struct rte_event_eth_rx_adapter_stats dev_stats; > struct rte_eventdev *dev; > @@ -2673,7 +2640,7 @@ rte_event_eth_rx_adapter_stats_get(uint8_t id, > int rte_event_eth_rx_adapter_stats_reset(uint8_t id) { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct rte_eventdev *dev; > struct eth_device_info *dev_info; > uint32_t i; > @@ -2701,7 +2668,7 @@ rte_event_eth_rx_adapter_stats_reset(uint8_t id) > int rte_event_eth_rx_adapter_service_id_get(uint8_t id, uint32_t > *service_id) { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; >=20 > RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, - > EINVAL); >=20 > @@ -2721,7 +2688,7 @@ rte_event_eth_rx_adapter_cb_register(uint8_t id, > rte_event_eth_rx_adapter_cb_fn > cb_fn, > void *cb_arg) > { > - struct rte_event_eth_rx_adapter *rx_adapter; > + struct event_eth_rx_adapter *rx_adapter; > struct eth_device_info *dev_info; > uint32_t cap; > int ret; > diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h > index 31fa9ac4b8..f1fcd6ce3d 100644 > --- a/lib/eventdev/rte_eventdev.h > +++ b/lib/eventdev/rte_eventdev.h > @@ -1193,7 +1193,7 @@ struct rte_event { > #define RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID 0x4 > /**< The application can override the adapter generated flow ID in the > * event. This flow ID can be specified when adding an ethdev Rx queue > - * to the adapter using the ev member of struct rte_event_eth_rx_adapter > + * to the adapter using the ev.flow_id member. > * @see struct rte_event_eth_rx_adapter_queue_conf::ev > * @see struct rte_event_eth_rx_adapter_queue_conf::rx_queue_flags > */ > -- > 2.17.1