diff mbox series

[CATERPILLAR,v4,2/3] linux-gen: pktio: renamve ODP_MDEV into _ODP_MDEV

Message ID 1516867212-18991-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [CATERPILLAR,v4,1/3] linux-gen: pktio: coding style fixup | expand

Commit Message

Github ODP bot Jan. 25, 2018, 8 a.m. UTC
From: Mykyta Iziumtsev <mykyta.iziumtsev@linaro.org>


ODP_ and odp_ prefixes are reserved for OpenDataPlane APIs.

Signed-off-by: Mykyta Iziumtsev <mykyta.iziumtsev@linaro.org>

---
/** Email created from pull request 408 (MykytaI:caterpillar_mdev_e1000e)
 ** https://github.com/Linaro/odp/pull/408
 ** Patch: https://github.com/Linaro/odp/pull/408.patch
 ** Base sha: f87bb5146fb25f7cd62246500cb4f7e625375654
 ** Merge commit sha: 9ab7ecd5f9b053b699caa643dd1de3bbe19c850d
 **/
 platform/linux-generic/m4/odp_mdev.m4     | 2 +-
 platform/linux-generic/pktio/mdev.c       | 4 ++--
 platform/linux-generic/pktio/mdev/cxgb4.c | 4 ++--
 platform/linux-generic/pktio/mdev/i40e.c  | 4 ++--
 platform/linux-generic/pktio/subsystem.c  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/platform/linux-generic/m4/odp_mdev.m4 b/platform/linux-generic/m4/odp_mdev.m4
index 64f9e0969..f424418ed 100644
--- a/platform/linux-generic/m4/odp_mdev.m4
+++ b/platform/linux-generic/m4/odp_mdev.m4
@@ -19,7 +19,7 @@  CPPFLAGS="$MDEV_CPPFLAGS $CPPFLAGS"
 ##########################################################################
 if test x$mdev_support = xyes
 then
-    AC_DEFINE([ODP_MDEV], [1],
+    AC_DEFINE([_ODP_MDEV], [1],
 	      [Define to 1 to enable mediated device drivers support])
     AC_SUBST([MDEV_CPPFLAGS])
 else
diff --git a/platform/linux-generic/pktio/mdev.c b/platform/linux-generic/pktio/mdev.c
index e3917146f..3353e416b 100644
--- a/platform/linux-generic/pktio/mdev.c
+++ b/platform/linux-generic/pktio/mdev.c
@@ -6,7 +6,7 @@ 
 
 #include "config.h"
 
-#if defined(ODP_MDEV) && ODP_MDEV == 1
+#if defined(_ODP_MDEV) && _ODP_MDEV == 1
 
 #include <dirent.h>
 #include <errno.h>
@@ -590,4 +590,4 @@  void mdev_device_destroy(mdev_device_t *mdev)
 		munmap(mdev->mappings[i].addr, mdev->mappings[i].size);
 }
 
-#endif /* ODP_MDEV */
+#endif /* _ODP_MDEV */
diff --git a/platform/linux-generic/pktio/mdev/cxgb4.c b/platform/linux-generic/pktio/mdev/cxgb4.c
index 5c55d87a4..9088eca96 100644
--- a/platform/linux-generic/pktio/mdev/cxgb4.c
+++ b/platform/linux-generic/pktio/mdev/cxgb4.c
@@ -6,7 +6,7 @@ 
 
 #include "config.h"
 
-#if defined(ODP_MDEV) && ODP_MDEV == 1
+#if defined(_ODP_MDEV) && _ODP_MDEV == 1
 
 #include <linux/types.h>
 #include <protocols/eth.h>
@@ -890,4 +890,4 @@  ODP_MODULE_CONSTRUCTOR(cxgb4_module_init)
  */
 int enable_link_cxgb4_pktio_ops;
 
-#endif /* ODP_MDEV */
+#endif /* _ODP_MDEV */
diff --git a/platform/linux-generic/pktio/mdev/i40e.c b/platform/linux-generic/pktio/mdev/i40e.c
index f2be2bcf3..25d91581e 100644
--- a/platform/linux-generic/pktio/mdev/i40e.c
+++ b/platform/linux-generic/pktio/mdev/i40e.c
@@ -6,7 +6,7 @@ 
 
 #include "config.h"
 
-#if defined(ODP_MDEV) && ODP_MDEV == 1
+#if defined(_ODP_MDEV) && _ODP_MDEV == 1
 
 #include <linux/types.h>
 #include <protocols/eth.h>
@@ -640,4 +640,4 @@  ODP_MODULE_CONSTRUCTOR(netmap_pktio_ops)
  */
 int enable_link_i40e_pktio_ops;
 
-#endif /* ODP_MDEV */
+#endif /* _ODP_MDEV */
diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c
index 199ed83fb..fe4f6df6f 100644
--- a/platform/linux-generic/pktio/subsystem.c
+++ b/platform/linux-generic/pktio/subsystem.c
@@ -44,7 +44,7 @@  extern int enable_link_socket_mmap_pktio_ops;
 #if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1
 extern int enable_link_tap_pktio_ops;
 #endif
-#if defined(ODP_MDEV) && ODP_MDEV == 1
+#if defined(_ODP_MDEV) && _ODP_MDEV == 1
 extern int enable_link_cxgb4_pktio_ops;
 extern int enable_link_i40e_pktio_ops;
 #endif
@@ -77,7 +77,7 @@  ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops)
 #if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1
 	enable_link_tap_pktio_ops = 1;
 #endif
-#if defined(ODP_MDEV) && ODP_MDEV == 1
+#if defined(_ODP_MDEV) && _ODP_MDEV == 1
 	enable_link_cxgb4_pktio_ops = 1;
 	enable_link_i40e_pktio_ops = 1;
 #endif