From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,
Long Wu <long.wu@corigine.com>,
Peng Zhang <peng.zhang@corigine.com>
Subject: [PATCH v2 01/11] net/nfp: move some source files
Date: Tue, 5 Dec 2023 10:54:47 +0800 [thread overview]
Message-ID: <20231205025457.1067372-2-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20231205025457.1067372-1-chaoyong.he@corigine.com>
Rename module 'nfp_flow' into 'nfp_flower_flow' and move the source
files into the 'flower' sub-directory.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
drivers/net/nfp/flower/nfp_conntrack.h | 2 +-
drivers/net/nfp/flower/nfp_flower_cmsg.h | 2 +-
.../net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c} | 4 ++--
.../net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h} | 10 +++++-----
drivers/net/nfp/flower/nfp_flower_representor.c | 2 +-
drivers/net/nfp/meson.build | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c} (99%)
rename drivers/net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h} (96%)
diff --git a/drivers/net/nfp/flower/nfp_conntrack.h b/drivers/net/nfp/flower/nfp_conntrack.h
index 5abab4e984..9bfca236ed 100644
--- a/drivers/net/nfp/flower/nfp_conntrack.h
+++ b/drivers/net/nfp/flower/nfp_conntrack.h
@@ -11,7 +11,7 @@
#include <ethdev_driver.h>
#include <rte_flow.h>
-#include "../nfp_flow.h"
+#include "nfp_flower_flow.h"
struct nfp_ct_map_entry;
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index c2938fb6f6..45543816ae 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -6,8 +6,8 @@
#ifndef __NFP_CMSG_H__
#define __NFP_CMSG_H__
-#include "../nfp_flow.h"
#include "nfp_flower.h"
+#include "nfp_flower_flow.h"
struct nfp_flower_cmsg_hdr {
rte_be16_t pad;
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c
similarity index 99%
rename from drivers/net/nfp/nfp_flow.c
rename to drivers/net/nfp/flower/nfp_flower_flow.c
index f832b52d89..e26be30d18 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
@@ -3,7 +3,7 @@
* All rights reserved.
*/
-#include "nfp_flow.h"
+#include "nfp_flower_flow.h"
#include <rte_flow_driver.h>
#include <rte_hash.h>
@@ -4318,7 +4318,7 @@ static const struct rte_flow_ops nfp_flow_ops = {
};
int
-nfp_net_flow_ops_get(struct rte_eth_dev *dev,
+nfp_flow_ops_get(struct rte_eth_dev *dev,
const struct rte_flow_ops **ops)
{
if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0) {
diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/flower/nfp_flower_flow.h
similarity index 96%
rename from drivers/net/nfp/nfp_flow.h
rename to drivers/net/nfp/flower/nfp_flower_flow.h
index 09e5b30dd8..75f18c6bd5 100644
--- a/drivers/net/nfp/nfp_flow.h
+++ b/drivers/net/nfp/flower/nfp_flower_flow.h
@@ -3,10 +3,10 @@
* All rights reserved.
*/
-#ifndef __NFP_FLOW_H__
-#define __NFP_FLOW_H__
+#ifndef __NFP_FLOWER_FLOW_H__
+#define __NFP_FLOWER_FLOW_H__
-#include "nfp_net_common.h"
+#include "../nfp_net_common.h"
/* The firmware expects lengths in units of long words */
#define NFP_FL_LW_SIZ 2
@@ -182,7 +182,7 @@ struct nfp_flower_representor;
int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev);
void nfp_flow_priv_uninit(struct nfp_pf_dev *pf_dev);
-int nfp_net_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops);
+int nfp_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops);
bool nfp_flow_inner_item_get(const struct rte_flow_item items[],
const struct rte_flow_item **inner_item);
struct rte_flow *nfp_flow_process(struct nfp_flower_representor *representor,
@@ -202,4 +202,4 @@ int nfp_flow_destroy(struct rte_eth_dev *dev,
struct rte_flow *nfp_flow,
struct rte_flow_error *error);
-#endif /* __NFP_FLOW_H__ */
+#endif /* __NFP_FLOWER_FLOW_H__ */
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index 02089d390e..7d8c055b80 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -435,7 +435,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = {
.mac_addr_set = nfp_flower_repr_mac_addr_set,
.fw_version_get = nfp_net_firmware_version_get,
- .flow_ops_get = nfp_net_flow_ops_get,
+ .flow_ops_get = nfp_flow_ops_get,
.mtr_ops_get = nfp_net_mtr_ops_get,
};
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index cf9c16266d..8407073af8 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -11,6 +11,7 @@ sources = files(
'flower/nfp_flower.c',
'flower/nfp_flower_cmsg.c',
'flower/nfp_flower_ctrl.c',
+ 'flower/nfp_flower_flow.c',
'flower/nfp_flower_representor.c',
'nfd3/nfp_nfd3_dp.c',
'nfdk/nfp_nfdk_dp.c',
@@ -30,7 +31,6 @@ sources = files(
'nfp_cpp_bridge.c',
'nfp_ethdev.c',
'nfp_ethdev_vf.c',
- 'nfp_flow.c',
'nfp_ipsec.c',
'nfp_logs.c',
'nfp_mtr.c',
--
2.39.1
next prev parent reply other threads:[~2023-12-05 2:55 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-03 6:25 [PATCH 00/11] Add basic flow support for corenic firmware Chaoyong He
2023-11-03 6:25 ` [PATCH 01/11] net/nfp: move some source files Chaoyong He
2023-11-03 6:25 ` [PATCH 02/11] drivers: add the structures and functions for flow offload Chaoyong He
2023-11-03 6:25 ` [PATCH 03/11] net/nfp: add the control message channel Chaoyong He
2023-11-03 6:25 ` [PATCH 04/11] net/nfp: support flow API for CoreNIC firmware Chaoyong He
2023-11-03 6:26 ` [PATCH 05/11] net/nfp: support Ethernet flow item Chaoyong He
2023-11-03 6:26 ` [PATCH 06/11] net/nfp: support drop flow action Chaoyong He
2023-11-03 6:26 ` [PATCH 07/11] net/nfp: support IPv4 flow item Chaoyong He
2023-11-03 6:26 ` [PATCH 08/11] net/nfp: support IPv6 " Chaoyong He
2023-11-03 6:26 ` [PATCH 09/11] net/nfp: support TCP/UDP/SCTP flow items Chaoyong He
2023-11-03 6:26 ` [PATCH 10/11] drivers: support MARK flow action Chaoyong He
2023-11-03 6:26 ` [PATCH 11/11] net/nfp: support QUEUE " Chaoyong He
2023-11-03 16:12 ` [PATCH 00/11] Add basic flow support for corenic firmware Ferruh Yigit
2023-11-07 1:42 ` Chaoyong He
2023-11-07 9:18 ` Ferruh Yigit
2023-11-07 9:23 ` Chaoyong He
2023-11-07 16:50 ` Patrick Robb
2023-11-07 17:04 ` Patrick Robb
2023-11-07 20:19 ` Ferruh Yigit
2023-11-07 21:59 ` Patrick Robb
2023-11-03 17:01 ` Ferruh Yigit
2023-12-05 2:54 ` [PATCH v2 " Chaoyong He
2023-12-05 2:54 ` Chaoyong He [this message]
2023-12-05 2:54 ` [PATCH v2 02/11] net/nfp: add the structures and functions for flow offload Chaoyong He
2023-12-05 2:54 ` [PATCH v2 03/11] net/nfp: add the control message channel Chaoyong He
2023-12-08 19:15 ` Ferruh Yigit
2023-12-05 2:54 ` [PATCH v2 04/11] net/nfp: support flow API for CoreNIC firmware Chaoyong He
2023-12-05 2:54 ` [PATCH v2 05/11] net/nfp: support Ethernet flow item Chaoyong He
2023-12-05 2:54 ` [PATCH v2 06/11] net/nfp: support drop flow action Chaoyong He
2023-12-05 2:54 ` [PATCH v2 07/11] net/nfp: support IPv4 flow item Chaoyong He
2023-12-05 2:54 ` [PATCH v2 08/11] net/nfp: support IPv6 " Chaoyong He
2023-12-05 2:54 ` [PATCH v2 09/11] net/nfp: support TCP/UDP/SCTP flow items Chaoyong He
2023-12-05 2:54 ` [PATCH v2 10/11] net/nfp: support MARK flow action Chaoyong He
2023-12-05 2:54 ` [PATCH v2 11/11] net/nfp: support QUEUE " Chaoyong He
2023-12-08 16:39 ` [PATCH v2 00/11] Add basic flow support for corenic firmware Ferruh Yigit
2023-12-11 1:42 ` Chaoyong He
2023-12-11 14:06 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231205025457.1067372-2-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=long.wu@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=peng.zhang@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).