[PATCH 04/25] net/nfp: rename ctrl module name

[Chaoyong He]

Rename the 'nfp_ctrl' module into 'nfp_net_ctrl' module, because which
is more suitable and we will add 'nfp_common_ctrl' module in the
'drivers/common/nfp' directory.

Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
Reviewed-by: Peng Zhang <peng.zh...@corigine.com>
---
 drivers/net/nfp/meson.build                    | 2 +-
 drivers/net/nfp/nfp_ipsec.c                    | 2 +-
 drivers/net/nfp/nfp_net_common.h               | 2 +-
 drivers/net/nfp/{nfp_ctrl.c => nfp_net_ctrl.c} | 2 +-
 drivers/net/nfp/{nfp_ctrl.h => nfp_net_ctrl.h} | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename drivers/net/nfp/{nfp_ctrl.c => nfp_net_ctrl.c} (98%)
 rename drivers/net/nfp/{nfp_ctrl.h => nfp_net_ctrl.h} (99%)

diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 40748ccc98..d54dca36e9 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -29,7 +29,6 @@ sources = files(
         'nfpcore/nfp_target.c',
         'nfpcore/nfp6000_pcie.c',
         'nfp_cpp_bridge.c',
-        'nfp_ctrl.c',
         'nfp_ethdev.c',
         'nfp_ethdev_vf.c',
         'nfp_flow.c',
@@ -37,6 +36,7 @@ sources = files(
         'nfp_logs.c',
         'nfp_mtr.c',
         'nfp_net_common.c',
+        'nfp_net_ctrl.c',
         'nfp_rxtx.c',
 )
 
diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c
index f137e4b50c..af85e8575c 100644
--- a/drivers/net/nfp/nfp_ipsec.c
+++ b/drivers/net/nfp/nfp_ipsec.c
@@ -12,9 +12,9 @@
 #include <ethdev_driver.h>
 #include <ethdev_pci.h>
 
-#include "nfp_ctrl.h"
 #include "nfp_logs.h"
 #include "nfp_net_common.h"
+#include "nfp_net_ctrl.h"
 #include "nfp_rxtx.h"
 
 #define NFP_UDP_ESP_PORT            4500
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index cf08df4618..8a02911c45 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -11,7 +11,7 @@
 #include <rte_io.h>
 #include <rte_spinlock.h>
 
-#include "nfp_ctrl.h"
+#include "nfp_net_ctrl.h"
 #include "nfpcore/nfp_dev.h"
 
 /* Macros for accessing the Queue Controller Peripheral 'CSRs' */
diff --git a/drivers/net/nfp/nfp_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c
similarity index 98%
rename from drivers/net/nfp/nfp_ctrl.c
rename to drivers/net/nfp/nfp_net_ctrl.c
index a95e35c9a5..b0a427c98e 100644
--- a/drivers/net/nfp/nfp_ctrl.c
+++ b/drivers/net/nfp/nfp_net_ctrl.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-#include "nfp_ctrl.h"
+#include "nfp_net_ctrl.h"
 
 #include <ethdev_pci.h>
 
diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_net_ctrl.h
similarity index 99%
rename from drivers/net/nfp/nfp_ctrl.h
rename to drivers/net/nfp/nfp_net_ctrl.h
index 9ec51e0a25..3772b28a66 100644
--- a/drivers/net/nfp/nfp_ctrl.h
+++ b/drivers/net/nfp/nfp_net_ctrl.h
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __NFP_CTRL_H__
-#define __NFP_CTRL_H__
+#ifndef __NFP_NET_CTRL_H__
+#define __NFP_NET_CTRL_H__
 
 #include <stdint.h>
 
@@ -571,4 +571,4 @@ nfp_net_cfg_ctrl_rss(uint32_t hw_cap)
        return NFP_NET_CFG_CTRL_RSS;
 }
 
-#endif /* __NFP_CTRL_H__ */
+#endif /* __NFP_NET_CTRL_H__ */
-- 
2.39.1