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