[SRU][Trusty][PATCH 4/6] UBUNTU: SAUCE: i40e_bpo: Rename the driver to i40e_bpo

Juerg Haefliger juerg.haefliger at canonical.com
Fri Aug 31 11:29:19 UTC 2018


BugLink: https://bugs.launchpad.net/bugs/1789215

To prevent a name space collision with the in-tree i40e driver.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 ubuntu/i40e/Makefile     | 10 +++++-----
 ubuntu/i40e/i40e_main.c  |  4 ++--
 ubuntu/i40e/i40e_osdep.h |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ubuntu/i40e/Makefile b/ubuntu/i40e/Makefile
index a7f1aedc9551..2688b0669605 100644
--- a/ubuntu/i40e/Makefile
+++ b/ubuntu/i40e/Makefile
@@ -30,9 +30,9 @@
 
 ccflags-y := -DXENIAL_BPO
 
-obj-$(CONFIG_I40E) += i40e.o
+obj-$(CONFIG_I40E_BPO) += i40e_bpo.o
 
-i40e-objs := i40e_main.o \
+i40e_bpo-objs := i40e_main.o \
 	i40e_ethtool.o	\
 	i40e_adminq.o	\
 	i40e_common.o	\
@@ -45,7 +45,7 @@ i40e-objs := i40e_main.o \
 	i40e_ptp.o	\
 	i40e_virtchnl_pf.o
 
-i40e-$(CONFIG_I40E_DCB) += i40e_dcb.o i40e_dcb_nl.o
-i40e-$(CONFIG_I40E_FCOE) += i40e_fcoe.o
+i40e_bpo-$(CONFIG_I40E_BPO_DCB) += i40e_dcb.o i40e_dcb_nl.o
+i40e_bpo-$(CONFIG_I40E_BPO_FCOE) += i40e_fcoe.o
 
-i40e-y += kcompat.o
+i40e_bpo-y += kcompat.o
diff --git a/ubuntu/i40e/i40e_main.c b/ubuntu/i40e/i40e_main.c
index 2781df5fb2c4..c15062eb7aa9 100644
--- a/ubuntu/i40e/i40e_main.c
+++ b/ubuntu/i40e/i40e_main.c
@@ -38,9 +38,9 @@
 #include <net/geneve.h>
 #endif
 
-const char i40e_driver_name[] = "i40e";
+const char i40e_driver_name[] = "i40e_bpo";
 static const char i40e_driver_string[] =
-			"Intel(R) Ethernet Connection XL710 Network Driver";
+		"Intel(R) Ethernet Connection XL710 Network Driver (bpo)";
 
 #define DRV_KERN "-k"
 
diff --git a/ubuntu/i40e/i40e_osdep.h b/ubuntu/i40e/i40e_osdep.h
index f1fd74088748..e8302685ec00 100644
--- a/ubuntu/i40e/i40e_osdep.h
+++ b/ubuntu/i40e/i40e_osdep.h
@@ -74,7 +74,7 @@ struct i40e_virt_mem {
 #define i40e_debug(h, m, s, ...)                                \
 do {                                                            \
 	if (((m) & (h)->debug_mask))                            \
-		pr_info("i40e %02x.%x " s,                      \
+		pr_info("i40e_bpo %02x.%x " s,                  \
 			(h)->bus.device, (h)->bus.func,         \
 			##__VA_ARGS__);                         \
 } while (0)
-- 
2.17.1





More information about the kernel-team mailing list