Skip to content

Commit

Permalink
net: ethernet: cavium: Correct Cavium Thunderx NIC driver names accor…
Browse files Browse the repository at this point in the history
…dingly 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 <Vadim.Lomovtsev@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vadim Lomovtsev authored and David S. Miller committed Jan 29, 2018
1 parent bfbe5ba commit 6b9e654
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cavium/thunder/nic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cavium/thunder/nicvf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cavium/thunder/thunder_xcv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 6b9e654

Please sign in to comment.