: myri_sbus: Convert to net_device_ops.
Subsystems (2)
David Miller
maintainerPATCH 1/4 : myri_sbus: Convert to net_device_ops.
Signed-off-by David S. Miller <[email protected]>
--- drivers/net/myri_sbus.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/myri_sbus.c +10 -6
@@ -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_devicsbus_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 );
Signature · 1 line
1.6.2.1.222.g570cc
Quoted 11 lines · On Mon, 23 Mar 2009 13:47:10 -0700 (PDT) David Miller <[email protected]>…
Signed-off-by David S. Miller <[email protected]>--- drivers/net/myri_sbus.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)drivers/net/myri_sbus.c +0
-0
drivers/net/myri_sbus.c static const struct header_ops myri_header_ops = { · line 905
Quoted 10 lines
drivers/net/myri_sbus.c +7
-0@@ -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,
Missing ndo_validate_addr and ndo_set_mac_address
Quoted 28 lines
drivers/net/myri_sbus.c +3
-6+}; +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_devicsbus_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 );