diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-23 13:33:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-23 13:33:11 -0700 |
| commit | adaa0db1da2d885f49dd2dcc357cdbe68e6dc283 (patch) | |
| tree | 78d2e1287d310e0842dc79734b22f01e59076a21 | |
| parent | 268ed76d67d658684d4b1e114d4da75ad360b4b1 (diff) | |
myri_sbus: Convert to net_device_ops.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 88b52883ace..4ced27f1830 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 = { .cache_update = myri_header_cache_update, }; +static const struct net_device_ops myri_ops = { + .ndo_open = myri_open, + .ndo_stop = myri_close, + .ndo_start_xmit = myri_start_xmit, + .ndo_set_multicast_list = myri_set_multicast, + .ndo_tx_timeout = myri_tx_timeout, + .ndo_change_mtu = myri_change_mtu, +}; + static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match) { struct device_node *dp = op->node; @@ -1048,13 +1057,9 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic sbus_writel((1 << i), mp->cregs + MYRICTRL_IRQLVL); mp->dev = dev; - dev->open = &myri_open; - dev->stop = &myri_close; - dev->hard_start_xmit = &myri_start_xmit; - dev->tx_timeout = &myri_tx_timeout; dev->watchdog_timeo = 5*HZ; - dev->set_multicast_list = &myri_set_multicast; dev->irq = op->irqs[0]; + dev->netdev_ops = &myri_ops; /* Register interrupt handler now. */ DET(("Requesting MYRIcom IRQ line.\n")); @@ -1065,7 +1070,6 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic } dev->mtu = MYRINET_MTU; - dev->change_mtu = myri_change_mtu; dev->header_ops = &myri_header_ops; dev->hard_header_len = (ETH_HLEN + MYRI_PAD_LEN); |