Skip to contentSkip to conversation

Revert "hv_netvsc: report vmbus name in ethtool"

PATCH Applied Stephen Hemminger 2 participants 2 messages Oct 26, 2016 – Oct 29, 2016

Subsystems (3)
Networking Network drivers Hyper-V/Azure core and drivers
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

PATCH 1/1 Revert "hv_netvsc: report vmbus name in ethtool"

From: Stephen Hemminger <[email protected]>

This reverts commit e3f74b841d48
("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 Stephen Hemminger <[email protected]>
---
 drivers/net/hyperv/netvsc_drv.c | 4 ----
 include/linux/hyperv.h          | 7 -------
 2 files changed, 11 deletions(-)
drivers/net/hyperv/netvsc_drv.c +0 -4
index c71d966..f638215 100644
@@ -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
index 6824556..cd184bd 100644
@@ -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,
Signature · 1 line
2.9.3
maintainer Applied
#1 lore raw

From: Stephen Hemminger <[email protected]>
Date: Wed, 26 Oct 2016 09:27:53 -0700

Quoted 10 lines

From: Stephen Hemminger <[email protected]>

This reverts commit e3f74b841d48
("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 Stephen Hemminger <[email protected]>

Applied.