Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b9e6547 authored by Vadim Lomovtsev's avatar Vadim Lomovtsev Committed by David S. Miller
Browse files

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: default avatarVadim Lomovtsev <Vadim.Lomovtsev@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bfbe5bab

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */