diff --git a/drivers/net/cnxk/cn10k_rx.c b/drivers/net/cnxk/cn10k_rx.c
deleted file mode 100644
index 15f71b1..0000000
--- a/drivers/net/cnxk/cn10k_rx.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2021 Marvell.
- */
-
-#include "cn10k_ethdev.h"
-#include "cn10k_rx.h"
-
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-	uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name(	       \
-		void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)      \
-	{                                                                      \
-		return cn10k_nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));  \
-	}                                                                      \
-
-NIX_RX_FASTPATH_MODES
-#undef R
-
-static inline void
-pick_rx_func(struct rte_eth_dev *eth_dev,
-	     const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2])
-{
-	struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-
-	/* [VLAN] [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */
-	eth_dev->rx_pkt_burst = rx_burst
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)];
-
-	if (eth_dev->data->dev_started)
-		rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
-			eth_dev->rx_pkt_burst;
-
-	rte_atomic_thread_fence(__ATOMIC_RELEASE);
-}
-
-void
-cn10k_eth_set_rx_function(struct rte_eth_dev *eth_dev)
-{
-	struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-
-	const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			      \
-	[f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			      \
-	[f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_mseg_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			      \
-	[f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_vec_burst_mseg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                            \
-	[f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_mseg_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	/* Copy multi seg version with no offload for tear down sequence */
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-		dev->rx_pkt_burst_no_offload =
-			nix_eth_rx_burst_mseg[0][0][0][0][0][0][0];
-
-	if (dev->scalar_ena) {
-		if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
-			return pick_rx_func(eth_dev, nix_eth_rx_burst_mseg);
-		return pick_rx_func(eth_dev, nix_eth_rx_burst);
-	}
-
-	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
-		return pick_rx_func(eth_dev, nix_eth_rx_vec_burst_mseg);
-	return pick_rx_func(eth_dev, nix_eth_rx_vec_burst);
-}
diff --git a/drivers/net/cnxk/cn9k_rx.c b/drivers/net/cnxk/cn9k_rx.c
deleted file mode 100644
index 185b643..0000000
--- a/drivers/net/cnxk/cn9k_rx.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2021 Marvell.
- */
-
-#include "cn9k_ethdev.h"
-#include "cn9k_rx.h"
-
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-	uint16_t __rte_noinline __rte_hot cn9k_nix_recv_pkts_##name(	       \
-		void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)      \
-	{                                                                      \
-		return cn9k_nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));   \
-	}
-
-NIX_RX_FASTPATH_MODES
-#undef R
-
-static inline void
-pick_rx_func(struct rte_eth_dev *eth_dev,
-	     const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2])
-{
-	struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-
-	/* [TSP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
-	eth_dev->rx_pkt_burst = rx_burst
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)];
-
-	if (eth_dev->data->dev_started)
-		rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
-			eth_dev->rx_pkt_burst;
-
-	rte_atomic_thread_fence(__ATOMIC_RELEASE);
-}
-
-void
-cn9k_eth_set_rx_function(struct rte_eth_dev *eth_dev)
-{
-	struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-
-	const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_mseg_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_vec_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_vec_burst_mseg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_vec_mseg_##name,
-
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	/* Copy multi seg version with no offload for tear down sequence */
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-		dev->rx_pkt_burst_no_offload =
-			nix_eth_rx_burst_mseg[0][0][0][0][0][0][0];
-
-	if (dev->scalar_ena) {
-		if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
-			return pick_rx_func(eth_dev, nix_eth_rx_burst_mseg);
-		return pick_rx_func(eth_dev, nix_eth_rx_burst);
-	}
-
-	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
-		return pick_rx_func(eth_dev, nix_eth_rx_vec_burst_mseg);
-	return pick_rx_func(eth_dev, nix_eth_rx_vec_burst);
-}
diff --git a/drivers/net/cnxk/cn9k_tx.c b/drivers/net/cnxk/cn9k_tx.c
deleted file mode 100644
index f99e5d3..0000000
--- a/drivers/net/cnxk/cn9k_tx.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2021 Marvell.
- */
-
-#include "cn9k_ethdev.h"
-#include "cn9k_tx.h"
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			       \
-	uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_##name(	       \
-		void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
-	{                                                                      \
-		uint64_t cmd[sz];                                              \
-									       \
-		/* For TSO inner checksum is a must */                         \
-		if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&			       \
-		    !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))		       \
-			return 0;                                              \
-		return cn9k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd, flags);\
-	}
-
-NIX_TX_FASTPATH_MODES
-#undef T
-
-static inline void
-pick_tx_func(struct rte_eth_dev *eth_dev,
-	     const eth_tx_burst_t tx_burst[2][2][2][2][2][2][2])
-{
-	struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-
-	/* [TS] [TSO] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */
-	eth_dev->tx_pkt_burst = tx_burst
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_SECURITY_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSTAMP_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSO_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
-
-	if (eth_dev->data->dev_started)
-		rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst =
-			eth_dev->tx_pkt_burst;
-}
-
-void
-cn9k_eth_set_tx_function(struct rte_eth_dev *eth_dev)
-{
-	struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-
-	const eth_tx_burst_t nix_eth_tx_burst[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_##name,
-
-		NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	const eth_tx_burst_t nix_eth_tx_burst_mseg[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_mseg_##name,
-
-		NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	const eth_tx_burst_t nix_eth_tx_vec_burst[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_vec_##name,
-
-		NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	const eth_tx_burst_t nix_eth_tx_vec_burst_mseg[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			       \
-	[f6][f5][f4][f3][f2][f1][f0] = cn9k_nix_xmit_pkts_vec_mseg_##name,
-
-		NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	if (dev->scalar_ena) {
-		pick_tx_func(eth_dev, nix_eth_tx_burst);
-		if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
-			pick_tx_func(eth_dev, nix_eth_tx_burst_mseg);
-	} else {
-		pick_tx_func(eth_dev, nix_eth_tx_vec_burst);
-		if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
-			pick_tx_func(eth_dev, nix_eth_tx_vec_burst_mseg);
-	}
-
-	rte_mb();
-}
