1 --- linux-2.4.22/drivers/usb/usbnet.c.orig 2004-09-19 03:08:09.000000000 -0400
2 +++ linux-2.4.22/drivers/usb/usbnet.c 2004-09-19 03:10:58.000000000 -0400
3 @@ -314,8 +314,6 @@ MODULE_PARM_DESC (msg_level, "Initial me
4 #define RUN_CONTEXT (in_irq () ? "in_irq" \
5 : (in_interrupt () ? "in_interrupt" : "can sleep"))
7 -static struct ethtool_ops usbnet_ethtool_ops;
9 /* mostly for PDA style devices, which are always present */
10 static int always_connected (struct usbnet *dev)
12 @@ -2515,7 +2513,6 @@ usbnet_probe (struct usb_device *udev, u
13 net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
14 net->tx_timeout = usbnet_tx_timeout;
15 net->do_ioctl = usbnet_ioctl;
16 - net->ethtool_ops = &usbnet_ethtool_ops;
18 // allow device-specific bind/init procedures
19 // NOTE net->name still not usable ...
20 @@ -2738,13 +2735,6 @@ static struct usb_driver usbnet_driver =
21 .disconnect = usbnet_disconnect,
24 -/* Default ethtool_ops assigned. Devices can override in their bind() routine */
25 -static struct ethtool_ops usbnet_ethtool_ops = {
26 - .get_drvinfo = usbnet_get_drvinfo,
27 - .get_link = usbnet_get_link,
28 - .get_msglevel = usbnet_get_msglevel,
29 - .set_msglevel = usbnet_set_msglevel,
31 /*-------------------------------------------------------------------------*/
33 static int __init usbnet_init (void)
34 --- linux-2.4.22/drivers/net/Makefile.orig 2004-09-21 19:29:09.000000000 -0400
35 +++ linux-2.4.22/drivers/net/Makefile 2004-09-21 19:30:33.000000000 -0400
36 @@ -267,6 +267,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
38 # non-drivers/net drivers who want mii lib
39 obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
40 +obj-$(CONFIG_USB_USBNET) += mii.o
42 ifeq ($(CONFIG_ARCH_ACORN),y)
43 mod-subdirs += ../acorn/net