Commit 7d644b0c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'gve-cleanups' 



Daode Huang says:

====================
net: gve: make cleanup for gve

This patch set replace deprecated strlcpy by strscpy, remove
repeat word "allowed" in gve driver.
for more details, please refer to each patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cbd801b3 f67435b5

drivers/net/ethernet/google/gve/gve_ethtool.c

+4 −4
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ static void gve_get_drvinfo(struct net_device *netdev, 
{

	struct gve_priv *priv = netdev_priv(netdev);



	strlcpy(info->driver, "gve", sizeof(info->driver));

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

	strlcpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));

	strscpy(info->driver, "gve", sizeof(info->driver));

	strscpy(info->version, gve_version_str, sizeof(info->version));

	strscpy(info->bus_info, pci_name(priv->pdev), sizeof(info->bus_info));

}



static void gve_set_msglevel(struct net_device *netdev, u32 value)
@@ -388,7 +388,7 @@ static int gve_set_channels(struct net_device *netdev, 


	gve_get_channels(netdev, &old_settings);



	/* Changing combined is not allowed allowed */

	/* Changing combined is not allowed */

	if (cmd->combined_count != old_settings.combined_count)

		return -EINVAL;