aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/meth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/meth.c')
-rw-r--r--drivers/net/meth.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index dbd3436912b8..5d04d94f2a21 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -770,9 +770,17 @@ static int meth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
770 } 770 }
771} 771}
772 772
773/* 773static const struct net_device_ops meth_netdev_ops = {
774 * Return statistics to the caller 774 .ndo_open = meth_open,
775 */ 775 .ndo_stop = meth_release,
776 .ndo_start_xmit = meth_tx,
777 .ndo_do_ioctl = meth_ioctl,
778 .ndo_tx_timeout = meth_tx_timeout,
779 .ndo_change_mtu = eth_change_mtu,
780 .ndo_validate_addr = eth_validate_addr,
781 .ndo_set_mac_address = eth_mac_addr,
782};
783
776/* 784/*
777 * The init function. 785 * The init function.
778 */ 786 */
@@ -786,16 +794,10 @@ static int __init meth_probe(struct platform_device *pdev)
786 if (!dev) 794 if (!dev)
787 return -ENOMEM; 795 return -ENOMEM;
788 796
789 dev->open = meth_open; 797 dev->netdev_ops = &meth_netdev_ops;
790 dev->stop = meth_release; 798 dev->watchdog_timeo = timeout;
791 dev->hard_start_xmit = meth_tx; 799 dev->irq = MACE_ETHERNET_IRQ;
792 dev->do_ioctl = meth_ioctl; 800 dev->base_addr = (unsigned long)&mace->eth;
793#ifdef HAVE_TX_TIMEOUT
794 dev->tx_timeout = meth_tx_timeout;
795 dev->watchdog_timeo = timeout;
796#endif
797 dev->irq = MACE_ETHERNET_IRQ;
798 dev->base_addr = (unsigned long)&mace->eth;
799 memcpy(dev->dev_addr, o2meth_eaddr, 6); 801 memcpy(dev->dev_addr, o2meth_eaddr, 6);
800 802
801 priv = netdev_priv(dev); 803 priv = netdev_priv(dev);