diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-23 16:33:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-23 16:33:11 -0400 |
commit | adaa0db1da2d885f49dd2dcc357cdbe68e6dc283 (patch) | |
tree | 78d2e1287d310e0842dc79734b22f01e59076a21 /drivers | |
parent | 268ed76d67d658684d4b1e114d4da75ad360b4b1 (diff) |
myri_sbus: Convert to net_device_ops.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/myri_sbus.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 88b52883acea..4ced27f1830c 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
@@ -896,6 +896,15 @@ static const struct header_ops myri_header_ops = { | |||
896 | .cache_update = myri_header_cache_update, | 896 | .cache_update = myri_header_cache_update, |
897 | }; | 897 | }; |
898 | 898 | ||
899 | static const struct net_device_ops myri_ops = { | ||
900 | .ndo_open = myri_open, | ||
901 | .ndo_stop = myri_close, | ||
902 | .ndo_start_xmit = myri_start_xmit, | ||
903 | .ndo_set_multicast_list = myri_set_multicast, | ||
904 | .ndo_tx_timeout = myri_tx_timeout, | ||
905 | .ndo_change_mtu = myri_change_mtu, | ||
906 | }; | ||
907 | |||
899 | static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match) | 908 | static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match) |
900 | { | 909 | { |
901 | struct device_node *dp = op->node; | 910 | struct device_node *dp = op->node; |
@@ -1048,13 +1057,9 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic | |||
1048 | sbus_writel((1 << i), mp->cregs + MYRICTRL_IRQLVL); | 1057 | sbus_writel((1 << i), mp->cregs + MYRICTRL_IRQLVL); |
1049 | 1058 | ||
1050 | mp->dev = dev; | 1059 | mp->dev = dev; |
1051 | dev->open = &myri_open; | ||
1052 | dev->stop = &myri_close; | ||
1053 | dev->hard_start_xmit = &myri_start_xmit; | ||
1054 | dev->tx_timeout = &myri_tx_timeout; | ||
1055 | dev->watchdog_timeo = 5*HZ; | 1060 | dev->watchdog_timeo = 5*HZ; |
1056 | dev->set_multicast_list = &myri_set_multicast; | ||
1057 | dev->irq = op->irqs[0]; | 1061 | dev->irq = op->irqs[0]; |
1062 | dev->netdev_ops = &myri_ops; | ||
1058 | 1063 | ||
1059 | /* Register interrupt handler now. */ | 1064 | /* Register interrupt handler now. */ |
1060 | DET(("Requesting MYRIcom IRQ line.\n")); | 1065 | DET(("Requesting MYRIcom IRQ line.\n")); |
@@ -1065,7 +1070,6 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic | |||
1065 | } | 1070 | } |
1066 | 1071 | ||
1067 | dev->mtu = MYRINET_MTU; | 1072 | dev->mtu = MYRINET_MTU; |
1068 | dev->change_mtu = myri_change_mtu; | ||
1069 | dev->header_ops = &myri_header_ops; | 1073 | dev->header_ops = &myri_header_ops; |
1070 | 1074 | ||
1071 | dev->hard_header_len = (ETH_HLEN + MYRI_PAD_LEN); | 1075 | dev->hard_header_len = (ETH_HLEN + MYRI_PAD_LEN); |