Commit ee05f031 authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files

[PATCH] iseries_veth: Be consistent about driver name, increment version 



The iseries_veth driver tells sysfs that it's called 'iseries_veth', but if
you ask it via ethtool it thinks it's called 'veth'. I think this comes from
2.4 when the driver was called 'veth', but it's definitely called
'iseries_veth' now, so fix it.

To make sure we don't do it again define DRV_NAME and use it everywhere.

While we're at it, change the version number to 2.0, to reflect the changes
made in this patch series.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 59f17aeb

drivers/net/iseries_veth.c

+10 −6
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ struct veth_lpevent { 


};



#define DRV_NAME	"iseries_veth"

#define DRV_VERSION	"2.0"



#define VETH_NUMBUFFERS		(120)

#define VETH_ACKTIMEOUT 	(1000000) /* microseconds */

#define VETH_MAX_MCAST		(12)
@@ -227,14 +230,14 @@ static void veth_timed_reset(unsigned long ptr); 
 */



#define veth_info(fmt, args...) \

	printk(KERN_INFO "iseries_veth: " fmt, ## args)

	printk(KERN_INFO DRV_NAME ": " fmt, ## args)



#define veth_error(fmt, args...) \

	printk(KERN_ERR "iseries_veth: Error: " fmt, ## args)

	printk(KERN_ERR DRV_NAME ": Error: " fmt, ## args)



#ifdef DEBUG

#define veth_debug(fmt, args...) \

	printk(KERN_DEBUG "iseries_veth: " fmt, ## args)

	printk(KERN_DEBUG DRV_NAME ": " fmt, ## args)

#else

#define veth_debug(fmt, args...) do {} while (0)

#endif
@@ -997,9 +1000,10 @@ static void veth_set_multicast_list(struct net_device *dev) 


static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

{

	strncpy(info->driver, "veth", sizeof(info->driver) - 1);

	strncpy(info->driver, DRV_NAME, sizeof(info->driver) - 1);

	info->driver[sizeof(info->driver) - 1] = '\0';

	strncpy(info->version, "1.0", sizeof(info->version) - 1);

	strncpy(info->version, DRV_VERSION, sizeof(info->version) - 1);

	info->version[sizeof(info->version) - 1] = '\0';

}



static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
@@ -1642,7 +1646,7 @@ static struct vio_device_id veth_device_table[] __devinitdata = { 
MODULE_DEVICE_TABLE(vio, veth_device_table);



static struct vio_driver veth_driver = {

	.name = "iseries_veth",

	.name = DRV_NAME,

	.id_table = veth_device_table,

	.probe = veth_probe,

	.remove = veth_remove

CRA Git | Maintained and supported by SUSTech CRA and CCSE