From 631b7568c7d8f0222773e1beb2460a86541ae394 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Thu, 25 Dec 2008 16:40:47 -0800 Subject: smsc911x: convert driver to use net_device_ops Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller --- drivers/net/smsc911x.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 8078f3545f1..761b96c1758 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -1733,6 +1733,19 @@ static struct ethtool_ops smsc911x_ethtool_ops = { .set_eeprom = smsc911x_ethtool_set_eeprom, }; +static const struct net_device_ops smsc911x_netdev_ops = { + .ndo_open = smsc911x_open, + .ndo_stop = smsc911x_stop, + .ndo_start_xmit = smsc911x_hard_start_xmit, + .ndo_get_stats = smsc911x_get_stats, + .ndo_set_multicast_list = smsc911x_set_multicast_list, + .ndo_do_ioctl = smsc911x_do_ioctl, + .ndo_validate_addr = eth_validate_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = smsc911x_poll_controller, +#endif +}; + /* Initializing private device structures, only called from probe */ static int __devinit smsc911x_init(struct net_device *dev) { @@ -1828,20 +1841,11 @@ static int __devinit smsc911x_init(struct net_device *dev) smsc911x_reg_write(pdata, INT_EN, 0); ether_setup(dev); - dev->open = smsc911x_open; - dev->stop = smsc911x_stop; - dev->hard_start_xmit = smsc911x_hard_start_xmit; - dev->get_stats = smsc911x_get_stats; - dev->set_multicast_list = smsc911x_set_multicast_list; dev->flags |= IFF_MULTICAST; - dev->do_ioctl = smsc911x_do_ioctl; netif_napi_add(dev, &pdata->napi, smsc911x_poll, SMSC_NAPI_WEIGHT); + dev->netdev_ops = &smsc911x_netdev_ops; dev->ethtool_ops = &smsc911x_ethtool_ops; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = smsc911x_poll_controller; -#endif /* CONFIG_NET_POLL_CONTROLLER */ - return 0; } -- cgit v1.2.3-70-g09d2