On Wed, Feb 23, 2022 at 12:01 AM <jer...@marvell.com> wrote: > > From: Jerin Jacob <jer...@marvell.com> > > Except for the cn*_rte_flow* files, none of the other > file has rte in the file name, remove the > rte to unify the file name across the directory. > > Signed-off-by: Jerin Jacob <jer...@marvell.com> > Acked-by: Kiran Kumar K <kirankum...@marvell.com>
Applied to dpdk-next-net-mrvl/for-next-net. Thanks > --- > > v2..v1: > > -Missed renaming cn10k_rte* and cn9k_rte* and fixed it > > > drivers/net/cnxk/cn10k_ethdev.c | 2 +- > drivers/net/cnxk/{cn10k_rte_flow.c => cn10k_flow.c} | 4 ++-- > drivers/net/cnxk/{cn10k_rte_flow.h => cn10k_flow.h} | 0 > drivers/net/cnxk/cn9k_ethdev.c | 2 +- > drivers/net/cnxk/{cn9k_rte_flow.c => cn9k_flow.c} | 4 ++-- > drivers/net/cnxk/{cn9k_rte_flow.h => cn9k_flow.h} | 0 > drivers/net/cnxk/{cnxk_rte_flow.c => cnxk_flow.c} | 2 +- > drivers/net/cnxk/{cnxk_rte_flow.h => cnxk_flow.h} | 0 > drivers/net/cnxk/meson.build | 6 +++--- > 9 files changed, 10 insertions(+), 10 deletions(-) > rename drivers/net/cnxk/{cn10k_rte_flow.c => cn10k_flow.c} (99%) > rename drivers/net/cnxk/{cn10k_rte_flow.h => cn10k_flow.h} (100%) > rename drivers/net/cnxk/{cn9k_rte_flow.c => cn9k_flow.c} (97%) > rename drivers/net/cnxk/{cn9k_rte_flow.h => cn9k_flow.h} (100%) > rename drivers/net/cnxk/{cnxk_rte_flow.c => cnxk_flow.c} (99%) > rename drivers/net/cnxk/{cnxk_rte_flow.h => cnxk_flow.h} (100%) > > diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c > index 9bb08e1824..f3003dd3df 100644 > --- a/drivers/net/cnxk/cn10k_ethdev.c > +++ b/drivers/net/cnxk/cn10k_ethdev.c > @@ -2,7 +2,7 @@ > * Copyright(C) 2021 Marvell. > */ > #include "cn10k_ethdev.h" > -#include "cn10k_rte_flow.h" > +#include "cn10k_flow.h" > #include "cn10k_rx.h" > #include "cn10k_tx.h" > > diff --git a/drivers/net/cnxk/cn10k_rte_flow.c b/drivers/net/cnxk/cn10k_flow.c > similarity index 99% > rename from drivers/net/cnxk/cn10k_rte_flow.c > rename to drivers/net/cnxk/cn10k_flow.c > index 529fb0e4b7..63281d41a4 100644 > --- a/drivers/net/cnxk/cn10k_rte_flow.c > +++ b/drivers/net/cnxk/cn10k_flow.c > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: BSD-3-Clause > * Copyright(C) 2020 Marvell. > */ > -#include <cnxk_rte_flow.h> > -#include "cn10k_rte_flow.h" > +#include <cnxk_flow.h> > +#include "cn10k_flow.h" > #include "cn10k_ethdev.h" > #include "cn10k_rx.h" > > diff --git a/drivers/net/cnxk/cn10k_rte_flow.h b/drivers/net/cnxk/cn10k_flow.h > similarity index 100% > rename from drivers/net/cnxk/cn10k_rte_flow.h > rename to drivers/net/cnxk/cn10k_flow.h > diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c > index 01e3850561..a890829065 100644 > --- a/drivers/net/cnxk/cn9k_ethdev.c > +++ b/drivers/net/cnxk/cn9k_ethdev.c > @@ -2,7 +2,7 @@ > * Copyright(C) 2021 Marvell. > */ > #include "cn9k_ethdev.h" > -#include "cn9k_rte_flow.h" > +#include "cn9k_flow.h" > #include "cn9k_rx.h" > #include "cn9k_tx.h" > > diff --git a/drivers/net/cnxk/cn9k_rte_flow.c b/drivers/net/cnxk/cn9k_flow.c > similarity index 97% > rename from drivers/net/cnxk/cn9k_rte_flow.c > rename to drivers/net/cnxk/cn9k_flow.c > index b94d29e547..d67580bf27 100644 > --- a/drivers/net/cnxk/cn9k_rte_flow.c > +++ b/drivers/net/cnxk/cn9k_flow.c > @@ -1,9 +1,9 @@ > /* SPDX-License-Identifier: BSD-3-Clause > * Copyright(C) 2020 Marvell. > */ > -#include <cnxk_rte_flow.h> > +#include <cnxk_flow.h> > #include "cn9k_ethdev.h" > -#include "cn9k_rte_flow.h" > +#include "cn9k_flow.h" > #include "cn9k_rx.h" > > struct rte_flow * > diff --git a/drivers/net/cnxk/cn9k_rte_flow.h b/drivers/net/cnxk/cn9k_flow.h > similarity index 100% > rename from drivers/net/cnxk/cn9k_rte_flow.h > rename to drivers/net/cnxk/cn9k_flow.h > diff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_flow.c > similarity index 99% > rename from drivers/net/cnxk/cnxk_rte_flow.c > rename to drivers/net/cnxk/cnxk_flow.c > index b08d7c34fa..8763ca63d6 100644 > --- a/drivers/net/cnxk/cnxk_rte_flow.c > +++ b/drivers/net/cnxk/cnxk_flow.c > @@ -1,7 +1,7 @@ > /* SPDX-License-Identifier: BSD-3-Clause > * Copyright(C) 2021 Marvell. > */ > -#include <cnxk_rte_flow.h> > +#include <cnxk_flow.h> > > const struct cnxk_rte_flow_term_info term[] = { > [RTE_FLOW_ITEM_TYPE_ETH] = {ROC_NPC_ITEM_TYPE_ETH, > diff --git a/drivers/net/cnxk/cnxk_rte_flow.h b/drivers/net/cnxk/cnxk_flow.h > similarity index 100% > rename from drivers/net/cnxk/cnxk_rte_flow.h > rename to drivers/net/cnxk/cnxk_flow.h > diff --git a/drivers/net/cnxk/meson.build b/drivers/net/cnxk/meson.build > index 83af1f4d0c..016a79b2a8 100644 > --- a/drivers/net/cnxk/meson.build > +++ b/drivers/net/cnxk/meson.build > @@ -19,7 +19,7 @@ sources = files( > 'cnxk_link.c', > 'cnxk_lookup.c', > 'cnxk_ptp.c', > - 'cnxk_rte_flow.c', > + 'cnxk_flow.c', > 'cnxk_stats.c', > 'cnxk_tm.c', > ) > @@ -28,7 +28,7 @@ sources = files( > sources += files( > 'cn9k_ethdev.c', > 'cn9k_ethdev_sec.c', > - 'cn9k_rte_flow.c', > + 'cn9k_flow.c', > 'cn9k_rx_select.c', > 'cn9k_tx_select.c', > ) > @@ -107,7 +107,7 @@ sources += files( > sources += files( > 'cn10k_ethdev.c', > 'cn10k_ethdev_sec.c', > - 'cn10k_rte_flow.c', > + 'cn10k_flow.c', > 'cn10k_rx_select.c', > 'cn10k_tx_select.c', > ) > -- > 2.35.1 >