aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-03-20 15:36:10 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-22 01:37:56 -0400
commit9b31b6971f448796768860e3c9ee2d22f4511731 (patch)
treeee3db16d639da5383a1a746d72a222539b977704 /drivers/net/pcmcia
parent6fb7298cdbe200b3b19cd59046785aecb0844198 (diff)
smc91c92: convert to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 41de04162e91..774232c13b31 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -300,6 +300,19 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value);
300static int smc_link_ok(struct net_device *dev); 300static int smc_link_ok(struct net_device *dev);
301static const struct ethtool_ops ethtool_ops; 301static const struct ethtool_ops ethtool_ops;
302 302
303static const struct net_device_ops smc_netdev_ops = {
304 .ndo_open = smc_open,
305 .ndo_stop = smc_close,
306 .ndo_start_xmit = smc_start_xmit,
307 .ndo_tx_timeout = smc_tx_timeout,
308 .ndo_set_config = s9k_config,
309 .ndo_set_multicast_list = set_rx_mode,
310 .ndo_do_ioctl = &smc_ioctl,
311 .ndo_change_mtu = eth_change_mtu,
312 .ndo_set_mac_address = eth_mac_addr,
313 .ndo_validate_addr = eth_validate_addr,
314};
315
303/*====================================================================== 316/*======================================================================
304 317
305 smc91c92_attach() creates an "instance" of the driver, allocating 318 smc91c92_attach() creates an "instance" of the driver, allocating
@@ -335,17 +348,9 @@ static int smc91c92_probe(struct pcmcia_device *link)
335 link->conf.IntType = INT_MEMORY_AND_IO; 348 link->conf.IntType = INT_MEMORY_AND_IO;
336 349
337 /* The SMC91c92-specific entries in the device structure. */ 350 /* The SMC91c92-specific entries in the device structure. */
338 dev->hard_start_xmit = &smc_start_xmit; 351 dev->netdev_ops = &smc_netdev_ops;
339 dev->set_config = &s9k_config;
340 dev->set_multicast_list = &set_rx_mode;
341 dev->open = &smc_open;
342 dev->stop = &smc_close;
343 dev->do_ioctl = &smc_ioctl;
344 SET_ETHTOOL_OPS(dev, &ethtool_ops); 352 SET_ETHTOOL_OPS(dev, &ethtool_ops);
345#ifdef HAVE_TX_TIMEOUT
346 dev->tx_timeout = smc_tx_timeout;
347 dev->watchdog_timeo = TX_TIMEOUT; 353 dev->watchdog_timeo = TX_TIMEOUT;
348#endif
349 354
350 smc->mii_if.dev = dev; 355 smc->mii_if.dev = dev;
351 smc->mii_if.mdio_read = mdio_read; 356 smc->mii_if.mdio_read = mdio_read;