Skip to content

Commit 6b9e654

Browse files
Vadim Lomovtsevdavem330
authored andcommitted
net: ethernet: cavium: Correct Cavium Thunderx NIC driver names accordingly to module name
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bfbe5ba commit 6b9e654

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

drivers/net/ethernet/cavium/thunder/nic_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "q_struct.h"
1919
#include "thunder_bgx.h"
2020

21-
#define DRV_NAME "thunder-nic"
21+
#define DRV_NAME "nicpf"
2222
#define DRV_VERSION "1.0"
2323

2424
struct hw_info {

drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "thunder_bgx.h"
1919
#include "../common/cavium_ptp.h"
2020

21-
#define DRV_NAME "thunder-nicvf"
21+
#define DRV_NAME "nicvf"
2222
#define DRV_VERSION "1.0"
2323

2424
struct nicvf_stat {

drivers/net/ethernet/cavium/thunder/nicvf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "thunder_bgx.h"
2929
#include "../common/cavium_ptp.h"
3030

31-
#define DRV_NAME "thunder-nicvf"
31+
#define DRV_NAME "nicvf"
3232
#define DRV_VERSION "1.0"
3333

3434
/* Supported devices */

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "nic.h"
2222
#include "thunder_bgx.h"
2323

24-
#define DRV_NAME "thunder-BGX"
24+
#define DRV_NAME "thunder_bgx"
2525
#define DRV_VERSION "1.0"
2626

2727
struct lmac {

drivers/net/ethernet/cavium/thunder/thunder_xcv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "nic.h"
2121
#include "thunder_bgx.h"
2222

23-
#define DRV_NAME "thunder-xcv"
23+
#define DRV_NAME "thunder_xcv"
2424
#define DRV_VERSION "1.0"
2525

2626
/* Register offsets */

0 commit comments

Comments
 (0)