diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-20 01:14:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 01:42:48 -0500 |
commit | 825a84d1d3d612c2b8db77dd4719882690d01bae (patch) | |
tree | 88f90161c7101610b44dc4d40e0ab29455245203 /drivers/net/atlx/atl1.c | |
parent | 1e058ab58f03fedbd2aa202c3a81c777d623be3a (diff) |
atlx: convert to net_device_ops
Convert this driver to network device ops. Compile tested only.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atlx/atl1.c')
-rw-r--r-- | drivers/net/atlx/atl1.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 611a86ebe164..7a0fb04e3480 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2880,6 +2880,21 @@ static void atl1_poll_controller(struct net_device *netdev) | |||
2880 | } | 2880 | } |
2881 | #endif | 2881 | #endif |
2882 | 2882 | ||
2883 | static const struct net_device_ops atl1_netdev_ops = { | ||
2884 | .ndo_open = atl1_open, | ||
2885 | .ndo_stop = atl1_close, | ||
2886 | .ndo_set_multicast_list = atlx_set_multi, | ||
2887 | .ndo_validate_addr = eth_validate_addr, | ||
2888 | .ndo_set_mac_address = atl1_set_mac, | ||
2889 | .ndo_change_mtu = atl1_change_mtu, | ||
2890 | .ndo_do_ioctl = atlx_ioctl, | ||
2891 | .ndo_tx_timeout = atlx_tx_timeout, | ||
2892 | .ndo_vlan_rx_register = atlx_vlan_rx_register, | ||
2893 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
2894 | .ndo_poll_controller = atl1_poll_controller, | ||
2895 | #endif | ||
2896 | }; | ||
2897 | |||
2883 | /* | 2898 | /* |
2884 | * atl1_probe - Device Initialization Routine | 2899 | * atl1_probe - Device Initialization Routine |
2885 | * @pdev: PCI device information struct | 2900 | * @pdev: PCI device information struct |
@@ -2967,20 +2982,9 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
2967 | adapter->mii.phy_id_mask = 0x1f; | 2982 | adapter->mii.phy_id_mask = 0x1f; |
2968 | adapter->mii.reg_num_mask = 0x1f; | 2983 | adapter->mii.reg_num_mask = 0x1f; |
2969 | 2984 | ||
2970 | netdev->open = &atl1_open; | 2985 | netdev->netdev_ops = &atl1_netdev_ops; |
2971 | netdev->stop = &atl1_close; | ||
2972 | netdev->hard_start_xmit = &atl1_xmit_frame; | 2986 | netdev->hard_start_xmit = &atl1_xmit_frame; |
2973 | |||
2974 | netdev->set_multicast_list = &atlx_set_multi; | ||
2975 | netdev->set_mac_address = &atl1_set_mac; | ||
2976 | netdev->change_mtu = &atl1_change_mtu; | ||
2977 | netdev->do_ioctl = &atlx_ioctl; | ||
2978 | netdev->tx_timeout = &atlx_tx_timeout; | ||
2979 | netdev->watchdog_timeo = 5 * HZ; | 2987 | netdev->watchdog_timeo = 5 * HZ; |
2980 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
2981 | netdev->poll_controller = atl1_poll_controller; | ||
2982 | #endif | ||
2983 | netdev->vlan_rx_register = atlx_vlan_rx_register; | ||
2984 | 2988 | ||
2985 | netdev->ethtool_ops = &atl1_ethtool_ops; | 2989 | netdev->ethtool_ops = &atl1_ethtool_ops; |
2986 | adapter->bd_number = cards_found; | 2990 | adapter->bd_number = cards_found; |