Commit 25cc76cf authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] typhoon build fix

Fix incorrect attempt to doubly-initialise the ethtool ops.

Cc: <jgarzik@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e8166f0e
......@@ -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...)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment