On Fri, Aug 01, 2003 at 12:25:36PM -0400, Jeff Garzik wrote:
On Fri, Aug 01, 2003 at 04:46:56PM +0100, Matthew Wilcox wrote:
On Fri, Aug 01, 2003 at 11:40:21AM -0400, Jeff Garzik wrote:
* need SET_ETHTOOL_OPS macro or HAVE_ETHTOOL_OPS test macro or similar
It's standard netdevice.h practice, and, he didn't disagree w/ my
rebuttal.
OK, now that the two of you thrashed out a design, here's my implementation:
diff -u drivers/net/8139too.c drivers/net/8139too.c
--- drivers/net/8139too.c 31 Jul 2003 17:09:52 -0000
+++ drivers/net/8139too.c 2 Aug 2003 18:38:25 -0000
@@ -973,7 +973,7 @@
dev->do_ioctl = netdev_ioctl;
dev->tx_timeout = rtl8139_tx_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
- dev->ethtool_ops = &rtl8139_ethtool_ops;
+ set_ethtool_ops(dev, &rtl8139_ethtool_ops);
/* note: the hardware is not capable of sg/csum/highdma, however
* through the use of skb_copy_and_csum_dev we enable these
diff -u drivers/net/tg3.c drivers/net/tg3.c
--- drivers/net/tg3.c 31 Jul 2003 11:12:10 -0000
+++ drivers/net/tg3.c 2 Aug 2003 18:37:54 -0000
@@ -6724,11 +6724,11 @@
dev->do_ioctl = tg3_ioctl;
dev->tx_timeout = tg3_tx_timeout;
dev->poll = tg3_poll;
- dev->ethtool_ops = &tg3_ethtool_ops;
dev->weight = 64;
dev->watchdog_timeo = TG3_TX_TIMEOUT;
dev->change_mtu = tg3_change_mtu;
dev->irq = pdev->irq;
+ set_ethtool_ops(dev, &tg3_ethtool_ops);
err = tg3_get_invariants(tp);
if (err) {
diff -u include/linux/netdevice.h include/linux/netdevice.h
--- include/linux/netdevice.h 31 Jul 2003 13:06:23 -0000
+++ include/linux/netdevice.h 2 Aug 2003 18:37:16 -0000
@@ -477,6 +477,10 @@
*/
#define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev))
+static inline void set_ethtool_ops(struct net_device *dev, struct ethtool_ops *
ops)
+{
+ dev->ethtool_ops = ops;
+}