Hi,
ethtool -i ethX should return the driver name instead of a 'verbose'
string. Other tools rely on the output.
2.5 might need a similar fix.
smirnow:~ # ethtool -i eth0
driver: 3c59x
version: LK1.1.16
firmware-version:
bus-info: 00:0a.0
smirnow:~ # ethtool -i eth1
driver: Pegasus/Pegasus II USB Ethernet v0.4.30 (2003/04/01)
version: v0.4.30 (2003/04/01)
firmware-version:
bus-info: usb1:8
CDCEther.c | 2 +-
catc.c | 2 +-
pegasus.c | 2 +-
rtl8150.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff -purN linux-2.4.21-rc7/drivers/usb/CDCEther.c
linux-2.4.21-rc7.ethtool/drivers/usb/CDCEther.c
--- linux-2.4.21-rc7/drivers/usb/CDCEther.c 2003-06-06 16:23:28.000000000 +0200
+++ linux-2.4.21-rc7.ethtool/drivers/usb/CDCEther.c 2003-06-06 16:30:12.000000000
+0200
@@ -460,7 +460,7 @@ static int netdev_ethtool_ioctl(struct n
/* get driver info */
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strncpy(info.driver, SHORT_DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
+ strncpy(info.driver, "CDCEther", ETHTOOL_BUSINFO_LEN);
strncpy(info.version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
sprintf(tmp, "usb%d:%d", ether_dev->usb->bus->busnum,
ether_dev->usb->devnum);
strncpy(info.bus_info, tmp, ETHTOOL_BUSINFO_LEN);
diff -purN linux-2.4.21-rc7/drivers/usb/catc.c
linux-2.4.21-rc7.ethtool/drivers/usb/catc.c
--- linux-2.4.21-rc7/drivers/usb/catc.c 2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.21-rc7.ethtool/drivers/usb/catc.c 2003-06-06 16:32:01.000000000 +0200
@@ -674,7 +674,7 @@ static int netdev_ethtool_ioctl(struct n
/* get driver info */
case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strncpy(info.driver, SHORT_DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
+ strncpy(info.driver, "catc", ETHTOOL_BUSINFO_LEN);
strncpy(info.version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
sprintf(tmp, "usb%d:%d", catc->usbdev->bus->busnum,
catc->usbdev->devnum);
strncpy(info.bus_info, tmp,ETHTOOL_BUSINFO_LEN);
diff -purN linux-2.4.21-rc7/drivers/usb/pegasus.c
linux-2.4.21-rc7.ethtool/drivers/usb/pegasus.c
--- linux-2.4.21-rc7/drivers/usb/pegasus.c 2003-06-06 16:23:29.000000000 +0200
+++ linux-2.4.21-rc7.ethtool/drivers/usb/pegasus.c 2003-06-06 16:36:02.000000000
+0200
@@ -868,7 +868,7 @@ static int pegasus_ethtool_ioctl(struct
switch (cmd) {
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);
sprintf(tmp, "usb%d:%d", pegasus->usb->bus->busnum,
diff -purN linux-2.4.21-rc7/drivers/usb/rtl8150.c
linux-2.4.21-rc7.ethtool/drivers/usb/rtl8150.c
--- linux-2.4.21-rc7/drivers/usb/rtl8150.c 2003-06-06 16:23:29.000000000 +0200
+++ linux-2.4.21-rc7.ethtool/drivers/usb/rtl8150.c 2003-06-06 16:36:34.000000000
+0200
@@ -577,7 +577,7 @@ static int rtl8150_ethtool_ioctl(struct
case ETHTOOL_GDRVINFO:{
struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
- strncpy(info.driver, DRIVER_DESC, ETHTOOL_BUSINFO_LEN);
+ strncpy(info.driver, "rtl8150", ETHTOOL_BUSINFO_LEN);
strncpy(info.version, DRIVER_VERSION,
ETHTOOL_BUSINFO_LEN);
sprintf(tmp, "usb%d:%d", dev->udev->bus->busnum,
--
USB is for mice, FireWire is for men!
-------------------------------------------------------
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
