Commit a1799af4 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

com20020: convert to net_devic_ops

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bca5b893
...@@ -151,6 +151,8 @@ static int __init com20020_init(void) ...@@ -151,6 +151,8 @@ static int __init com20020_init(void)
if (node && node != 0xff) if (node && node != 0xff)
dev->dev_addr[0] = node; dev->dev_addr[0] = node;
dev->netdev_ops = &com20020_netdev_ops;
lp = netdev_priv(dev); lp = netdev_priv(dev);
lp->backplane = backplane; lp->backplane = backplane;
lp->clockp = clockp & 7; lp->clockp = clockp & 7;
......
...@@ -72,6 +72,9 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de ...@@ -72,6 +72,9 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de
dev = alloc_arcdev(device); dev = alloc_arcdev(device);
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;
dev->netdev_ops = &com20020_netdev_ops;
lp = netdev_priv(dev); lp = netdev_priv(dev);
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
......
...@@ -149,6 +149,14 @@ int com20020_check(struct net_device *dev) ...@@ -149,6 +149,14 @@ int com20020_check(struct net_device *dev)
return 0; return 0;
} }
const struct net_device_ops com20020_netdev_ops = {
.ndo_open = arcnet_open,
.ndo_stop = arcnet_close,
.ndo_start_xmit = arcnet_send_packet,
.ndo_tx_timeout = arcnet_timeout,
.ndo_set_multicast_list = com20020_set_mc_list,
};
/* Set up the struct net_device associated with this card. Called after /* Set up the struct net_device associated with this card. Called after
* probing succeeds. * probing succeeds.
*/ */
...@@ -170,8 +178,6 @@ int com20020_found(struct net_device *dev, int shared) ...@@ -170,8 +178,6 @@ int com20020_found(struct net_device *dev, int shared)
lp->hw.copy_from_card = com20020_copy_from_card; lp->hw.copy_from_card = com20020_copy_from_card;
lp->hw.close = com20020_close; lp->hw.close = com20020_close;
dev->set_multicast_list = com20020_set_mc_list;
if (!dev->dev_addr[0]) if (!dev->dev_addr[0])
dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN*8); /* FIXME: do this some other way! */ dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN*8); /* FIXME: do this some other way! */
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
int com20020_check(struct net_device *dev); int com20020_check(struct net_device *dev);
int com20020_found(struct net_device *dev, int shared); int com20020_found(struct net_device *dev, int shared);
const struct net_device_ops com20020_netdev_ops;
/* The number of low I/O ports used by the card. */ /* The number of low I/O ports used by the card. */
#define ARCNET_TOTAL_SIZE 8 #define ARCNET_TOTAL_SIZE 8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment