Commit e934f684 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

Revert "hv_netvsc: report vmbus name in ethtool" 



This reverts commit e3f74b84
("hv_netvsc: report vmbus name in ethtool")'
because of problem introduced by commit f9a56e5d6a0ba
("Drivers: hv: make VMBus bus ids persistent").
This changed the format of the vmbus name and this new format is too
long to fit in the bus_info field of ethtool.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 104ba78c

drivers/net/hyperv/netvsc_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -699,12 +699,8 @@ int netvsc_recv_callback(struct hv_device *device_obj, 
static void netvsc_get_drvinfo(struct net_device *net,

			       struct ethtool_drvinfo *info)

{

	struct net_device_context *net_device_ctx = netdev_priv(net);

	struct hv_device *dev = net_device_ctx->device_ctx;



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

	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strlcpy(info->bus_info, vmbus_dev_name(dev), sizeof(info->bus_info));

}



static void netvsc_get_channels(struct net_device *net,

include/linux/hyperv.h

+0 −7
Original line number Diff line number Diff line
@@ -1169,13 +1169,6 @@ int __must_check __vmbus_driver_register(struct hv_driver *hv_driver, 
					 const char *mod_name);

void vmbus_driver_unregister(struct hv_driver *hv_driver);



static inline const char *vmbus_dev_name(const struct hv_device *device_obj)

{

	const struct kobject *kobj = &device_obj->device.kobj;



	return kobj->name;

}



void vmbus_hvsock_device_unregister(struct vmbus_channel *channel);



int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,

CRA Git | Maintained and supported by SUSTech CRA and CCSE