Commit bcacac7a authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: get drvinfo driver name from outside the common code 



Since ethtool_common.o will be built into both sfc and sfc_ef100 drivers,
 it can't use KBUILD_MODNAME directly.  Instead, make it reference a
 string provided by the individual driver code.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31f4cbd4

drivers/net/ethernet/sfc/ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ static int efx_ethtool_get_ts_info(struct net_device *net_dev, 
	return 0;

}



const char *efx_driver_name = KBUILD_MODNAME;



const struct ethtool_ops efx_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USECS_IRQ |

drivers/net/ethernet/sfc/ethtool_common.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void efx_ethtool_get_drvinfo(struct net_device *net_dev, 
{

	struct efx_nic *efx = netdev_priv(net_dev);



	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));

	strlcpy(info->driver, efx_driver_name, sizeof(info->driver));

	strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version));

	efx_mcdi_print_fwver(efx, info->fw_version,

			     sizeof(info->fw_version));

drivers/net/ethernet/sfc/ethtool_common.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#ifndef EFX_ETHTOOL_COMMON_H

#define EFX_ETHTOOL_COMMON_H



extern const char *efx_driver_name;



void efx_ethtool_get_drvinfo(struct net_device *net_dev,

			     struct ethtool_drvinfo *info);

u32 efx_ethtool_get_msglevel(struct net_device *net_dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE