Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs_enet: convert to netdev_ops

Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Alexander Beregalov and committed by
David S. Miller
8c02acd7 499923c7

+17 -10
+17 -10
drivers/net/fs_enet/fs_enet-main.c
··· 1019 1019 #define IS_FEC(match) 0 1020 1020 #endif 1021 1021 1022 + static const struct net_device_ops fs_enet_netdev_ops = { 1023 + .ndo_open = fs_enet_open, 1024 + .ndo_stop = fs_enet_close, 1025 + .ndo_get_stats = fs_enet_get_stats, 1026 + .ndo_start_xmit = fs_enet_start_xmit, 1027 + .ndo_tx_timeout = fs_timeout, 1028 + .ndo_set_multicast_list = fs_set_multicast_list, 1029 + .ndo_do_ioctl = fs_ioctl, 1030 + .ndo_validate_addr = eth_validate_addr, 1031 + .ndo_set_mac_address = eth_mac_addr, 1032 + .ndo_change_mtu = eth_change_mtu, 1033 + #ifdef CONFIG_NET_POLL_CONTROLLER 1034 + .ndo_poll_controller = fs_enet_netpoll, 1035 + #endif 1036 + }; 1037 + 1022 1038 static int __devinit fs_enet_probe(struct of_device *ofdev, 1023 1039 const struct of_device_id *match) 1024 1040 { ··· 1109 1093 fep->tx_ring = fpi->tx_ring; 1110 1094 fep->rx_ring = fpi->rx_ring; 1111 1095 1112 - ndev->open = fs_enet_open; 1113 - ndev->hard_start_xmit = fs_enet_start_xmit; 1114 - ndev->tx_timeout = fs_timeout; 1096 + ndev->netdev_ops = &fs_enet_netdev_ops; 1115 1097 ndev->watchdog_timeo = 2 * HZ; 1116 - ndev->stop = fs_enet_close; 1117 - ndev->get_stats = fs_enet_get_stats; 1118 - ndev->set_multicast_list = fs_set_multicast_list; 1119 - #ifdef CONFIG_NET_POLL_CONTROLLER 1120 - ndev->poll_controller = fs_enet_netpoll; 1121 - #endif 1122 1098 if (fpi->use_napi) 1123 1099 netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi, 1124 1100 fpi->napi_weight); 1125 1101 1126 1102 ndev->ethtool_ops = &fs_ethtool_ops; 1127 - ndev->do_ioctl = fs_ioctl; 1128 1103 1129 1104 init_timer(&fep->phy_timer_list); 1130 1105