aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-01-07 20:29:46 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-07 20:29:46 -0500
commit8bdd5553660bd07d7904af967893f8d487cc6c44 (patch)
tree6fbde95234b9e12b1061db86a093ec4c44919f88
parent3bc124dd02007290782a154ed3d12847489aae77 (diff)
typhoon: update to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/typhoon.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 0009f4e34433..3af9a9516ccb 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2296,6 +2296,19 @@ out:
2296 return mode; 2296 return mode;
2297} 2297}
2298 2298
2299static const struct net_device_ops typhoon_netdev_ops = {
2300 .ndo_open = typhoon_open,
2301 .ndo_stop = typhoon_close,
2302 .ndo_start_xmit = typhoon_start_tx,
2303 .ndo_set_multicast_list = typhoon_set_rx_mode,
2304 .ndo_tx_timeout = typhoon_tx_timeout,
2305 .ndo_get_stats = typhoon_get_stats,
2306 .ndo_validate_addr = eth_validate_addr,
2307 .ndo_set_mac_address = typhoon_set_mac_address,
2308 .ndo_change_mtu = eth_change_mtu,
2309 .ndo_vlan_rx_register = typhoon_vlan_rx_register,
2310};
2311
2299static int __devinit 2312static int __devinit
2300typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 2313typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2301{ 2314{
@@ -2495,16 +2508,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2495 } 2508 }
2496 2509
2497 /* The chip-specific entries in the device structure. */ 2510 /* The chip-specific entries in the device structure. */
2498 dev->open = typhoon_open; 2511 dev->netdev_ops = &typhoon_netdev_ops;
2499 dev->hard_start_xmit = typhoon_start_tx;
2500 dev->stop = typhoon_close;
2501 dev->set_multicast_list = typhoon_set_rx_mode;
2502 dev->tx_timeout = typhoon_tx_timeout;
2503 netif_napi_add(dev, &tp->napi, typhoon_poll, 16); 2512 netif_napi_add(dev, &tp->napi, typhoon_poll, 16);
2504 dev->watchdog_timeo = TX_TIMEOUT; 2513 dev->watchdog_timeo = TX_TIMEOUT;
2505 dev->get_stats = typhoon_get_stats;
2506 dev->set_mac_address = typhoon_set_mac_address;
2507 dev->vlan_rx_register = typhoon_vlan_rx_register;
2508 2514
2509 SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops); 2515 SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops);
2510 2516