fs_enet: convert to netdev_ops
Subsystems (3)
PATCH 1/1 fs_enet: convert to netdev_ops
Reported-by Subrata Modak <[email protected]>
Signed-off-by Alexander Beregalov <[email protected]>
---
drivers/net/fs_enet/fs_enet-main.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-)
drivers/net/fs_enet/fs_enet-main.c +17 -10
@@ -1019,6 +1019,22 @@ out_put_phy:#define IS_FEC (match) 0#endif +static const struct net_device_ops fs_enet_netdev_ops = { + .ndo_open = fs_enet_open, + .ndo_stop = fs_enet_close, + .ndo_get_stats = fs_enet_get_stats, + .ndo_start_xmit = fs_enet_start_xmit, + .ndo_tx_timeout = fs_timeout, + .ndo_set_multicast_list = fs_set_multicast_list, + .ndo_do_ioctl = fs_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = fs_enet_netpoll, +#endif +}; +static int __devinit fs_enet_probe (struct of_device *ofdev,const struct of_device_id *match) {
@@ -1093,22 +1109,13 @@ static int __devinit fs_enet_probe(struct of_device *ofdev, fep->tx_ring = fpi->tx_ring; fep->rx_ring = fpi->rx_ring; - ndev->open = fs_enet_open; - ndev->hard_start_xmit = fs_enet_start_xmit; - ndev->tx_timeout = fs_timeout; + ndev->netdev_ops = &fs_enet_netdev_ops; ndev->watchdog_timeo =2 *HZ ; - ndev->stop = fs_enet_close; - ndev->get_stats = fs_enet_get_stats; - ndev->set_multicast_list = fs_set_multicast_list; -#ifdef CONFIG_NET_POLL_CONTROLLER - ndev->poll_controller = fs_enet_netpoll; -#endif if (fpi->use_napi)netif_napi_add (ndev, &fep->napi, fs_enet_rx_napi, fpi->napi_weight); ndev->ethtool_ops = &fs_ethtool_ops; - ndev->do_ioctl = fs_ioctl;init_timer (&fep->phy_timer_list);
Quoted 2 lines · Alexander Beregalov
Reported-by Subrata Modak <[email protected]>Signed-off-by Alexander Beregalov <[email protected]>
Thanks. Adding Sachin in Cc:
Regards--
Subrata
Quoted 57 lines
---
drivers/net/fs_enet/fs_enet-main.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-)drivers/net/fs_enet/fs_enet-main.c +17
-10@@ -1019,6 +1019,22 @@ out_put_phy:#define IS_FEC (match) 0#endif +static const struct net_device_ops fs_enet_netdev_ops = { + .ndo_open = fs_enet_open, + .ndo_stop = fs_enet_close, + .ndo_get_stats = fs_enet_get_stats, + .ndo_start_xmit = fs_enet_start_xmit, + .ndo_tx_timeout = fs_timeout, + .ndo_set_multicast_list = fs_set_multicast_list, + .ndo_do_ioctl = fs_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = fs_enet_netpoll, +#endif +}; +static int __devinit fs_enet_probe (struct of_device *ofdev,const struct of_device_id *match) {@@ -1093,22 +1109,13 @@ static int __devinit fs_enet_probe(struct of_device *ofdev, fep->tx_ring = fpi->tx_ring; fep->rx_ring = fpi->rx_ring; - ndev->open = fs_enet_open; - ndev->hard_start_xmit = fs_enet_start_xmit; - ndev->tx_timeout = fs_timeout; + ndev->netdev_ops = &fs_enet_netdev_ops; ndev->watchdog_timeo =2 *HZ ; - ndev->stop = fs_enet_close; - ndev->get_stats = fs_enet_get_stats; - ndev->set_multicast_list = fs_set_multicast_list; -#ifdef CONFIG_NET_POLL_CONTROLLER - ndev->poll_controller = fs_enet_netpoll; -#endif if (fpi->use_napi)netif_napi_add (ndev, &fep->napi, fs_enet_rx_napi, fpi->napi_weight); ndev->ethtool_ops = &fs_ethtool_ops; - ndev->do_ioctl = fs_ioctl;init_timer (&fep->phy_timer_list);
David Miller
maintainerFrom: Subrata Modak <[email protected]>
Date: Thu, 09 Apr 2009 20:19:48 +0530
Quoted 5 lines · Alexander Beregalov
Quoted 2 lines
Reported-by Subrata Modak <[email protected]>Signed-off-by Alexander Beregalov <[email protected]>Thanks. Adding Sachin in Cc:
I've applied this patch.