From 25cc76cf489ccab59c62685879f79143ead4b073 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 19 Oct 2004 18:46:19 -0700 Subject: [PATCH] [PATCH] typhoon build fix Fix incorrect attempt to doubly-initialise the ethtool ops. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/net/typhoon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index d763bf6d310f2..b7d706fb03b7e 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -2469,14 +2469,13 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->set_multicast_list = typhoon_set_rx_mode; dev->tx_timeout = typhoon_tx_timeout; dev->poll = typhoon_poll; - dev->ethtool_ops = &typhoon_ethtool_ops; dev->weight = 16; dev->watchdog_timeo = TX_TIMEOUT; dev->get_stats = typhoon_get_stats; dev->set_mac_address = typhoon_set_mac_address; dev->vlan_rx_register = typhoon_vlan_rx_register; dev->vlan_rx_kill_vid = typhoon_vlan_rx_kill_vid; - SET_ETHTOOL_OPS(dev, &ops); + SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops); /* We can handle scatter gather, up to 16 entries, and * we can do IP checksumming (only version 4, doh...) -- 2.53.0