Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c02acd7 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by David S. Miller
Browse files

fs_enet: convert to netdev_ops 



Reported-by: default avatarSubrata Modak <subrata@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 499923c7

drivers/net/fs_enet/fs_enet-main.c

+17 −10
Original line number Diff line number Diff line
@@ -1019,6 +1019,22 @@ static int __devinit find_phy(struct device_node *np, 
#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);