net: ethernet: cavium: Correct Cavium Thunderx NIC driver names accordingly to module...

It was found that ethtool provides unexisting module name while
it queries the specified network device for associated driver
information. Then user tries to unload that module by provided
module name and fails.

This happens because ethtool reads value of DRV_NAME macro,
while module name is defined at the driver's Makefile.

This patch is to correct Cavium CN88xx Thunder NIC driver names
(DRV_NAME macro) 'thunder-nicvf' to 'nicvf' and 'thunder-nic'
to 'nicpf', sync bgx and xcv driver names accordingly to their
module names.

Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 8325577d7442edb7847d838f8270ac35ed1dd0fd..7ff66a8194e2742bbf459fd57917b427bf0de3fc 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -18,7 +18,7 @@
 #include "q_struct.h"
 #include "thunder_bgx.h"
 
-#define DRV_NAME       "thunder-nic"
+#define DRV_NAME       "nicpf"
 #define DRV_VERSION    "1.0"
 
 struct hw_info {

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
index ed9f10bdf41e83589f7153741e182256fe659b7f..5603f5ab1feeaf24899d5324b8f4f154ffea6479 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
@@ -18,7 +18,7 @@
 #include "thunder_bgx.h"
 #include "../common/cavium_ptp.h"
 
-#define DRV_NAME       "thunder-nicvf"
+#define DRV_NAME       "nicvf"
 #define DRV_VERSION     "1.0"
 
 struct nicvf_stat {

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index 881af8a120f59f4a57a73479b4ea3c4a484a9c77..b68cde9f17d2b10c08ca60c7a4d8c80f2d095b97 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -28,7 +28,7 @@
 #include "thunder_bgx.h"
 #include "../common/cavium_ptp.h"
 
-#define DRV_NAME       "thunder-nicvf"
+#define DRV_NAME       "nicvf"
 #define DRV_VERSION    "1.0"
 
 /* Supported devices */

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 0f23999c5bcfc4b60402cd94a57eb43f468582ef..91d34ea40e2c9e40507aee5a47748b61e94785f6 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -21,7 +21,7 @@
 #include "nic.h"
 #include "thunder_bgx.h"
 
-#define DRV_NAME       "thunder-BGX"
+#define DRV_NAME       "thunder_bgx"
 #define DRV_VERSION    "1.0"
 
 struct lmac {

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c
index 578c7f8f11bf23add2ac4d3c2263e371b4509136..2d5e8dab1f700640d14d9daf5b90e2fccd098ab7 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c
@@ -20,7 +20,7 @@
 #include "nic.h"
 #include "thunder_bgx.h"
 
-#define DRV_NAME       "thunder-xcv"
+#define DRV_NAME       "thunder_xcv"
 #define DRV_VERSION    "1.0"
 
 /* Register offsets */