ChangeSet 1.1243.50.8, 2003/06/10 14:35:17-07:00, [EMAIL PROTECTED]
[PATCH] USB: incorrect ethtool -i driver name
drivers/usb/net/catc.c | 6 ++++--
drivers/usb/net/kaweth.c | 6 ++++--
drivers/usb/net/rtl8150.c | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff -Nru a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
--- a/drivers/usb/net/catc.c Tue Jun 10 17:11:42 2003
+++ b/drivers/usb/net/catc.c Tue Jun 10 17:11:42 2003
@@ -63,6 +63,8 @@
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
+static const char driver_name[] = "catc";
+
/*
* Some defines.
*/
@@ -677,7 +679,7 @@
/* get driver info */
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strncpy(info.driver, SHORT_DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
+ strncpy(info.driver, driver_name, ETHTOOL_BUSINFO_LEN);
strncpy(info.version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
usb_make_path (catc->usbdev, info.bus_info, sizeof info.bus_info);
if (copy_to_user(useraddr, &info, sizeof(info)))
@@ -967,7 +969,7 @@
static struct usb_driver catc_driver = {
.owner = THIS_MODULE,
- .name = "catc",
+ .name = driver_name,
.probe = catc_probe,
.disconnect = catc_disconnect,
.id_table = catc_id_table,
diff -Nru a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
--- a/drivers/usb/net/kaweth.c Tue Jun 10 17:11:42 2003
+++ b/drivers/usb/net/kaweth.c Tue Jun 10 17:11:42 2003
@@ -114,6 +114,8 @@
MODULE_DESCRIPTION("KL5USB101 USB Ethernet driver");
MODULE_LICENSE("GPL");
+static const char driver_name[] = "kaweth";
+
static int kaweth_probe(
struct usb_interface *intf,
const struct usb_device_id *id /* from id_table */
@@ -169,7 +171,7 @@
****************************************************************/
static struct usb_driver kaweth_driver = {
.owner = THIS_MODULE,
- .name = "kaweth",
+ .name = driver_name,
.probe = kaweth_probe,
.disconnect = kaweth_disconnect,
.id_table = usb_klsi_table,
@@ -670,7 +672,7 @@
switch (ethcmd) {
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strlcpy(info.driver, "kaweth", sizeof(info.driver));
+ strlcpy(info.driver, driver_name, sizeof(info.driver));
if (copy_to_user(useraddr, &info, sizeof(info)))
return -EFAULT;
return 0;
diff -Nru a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
--- a/drivers/usb/net/rtl8150.c Tue Jun 10 17:11:42 2003
+++ b/drivers/usb/net/rtl8150.c Tue Jun 10 17:11:42 2003
@@ -114,9 +114,11 @@
static int rtl8150_probe(struct usb_interface *intf,
const struct usb_device_id *id);
+static const char driver_name [] = "rtl8150";
+
static struct usb_driver rtl8150_driver = {
.owner = THIS_MODULE,
- .name = "rtl8150",
+ .name = driver_name,
.probe = rtl8150_probe,
.disconnect = rtl8150_disconnect,
.id_table = rtl8150_table,
@@ -690,7 +692,7 @@
case ETHTOOL_GDRVINFO:{
struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
- strncpy(info.driver, DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
+ strncpy(info.driver, driver_name, ETHTOOL_BUSINFO_LEN);
strncpy(info.version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
usb_make_path(dev->udev, info.bus_info, sizeof info.bus_info);
if (copy_to_user(uaddr, &info, sizeof(info)))
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
