Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ariadne: convert to net_device_ops

Browse source 
On Fri, Apr 10, 2009 at 06:13:54PM +0200, Jan Ceuleers wrote:
> Alexander Beregalov wrote:
> >
> > Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> ...
> > @@ -197,13 +209,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
> >      dev->mem_start = ZTWO_VADDR(mem_start);
> >      dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE;
> >
> > -    dev->open = &ariadne_open;
> > -    dev->stop = &ariadne_close;
> > -    dev->hard_start_xmit = &ariadne_start_xmit;
> > -    dev->tx_timeout = &ariadne_tx_timeout;
> > +    dev->netdev_ops = &ariadne_netdev_ops;;
>
> We don't really need two semicolons there but I suppose that they won't
> hurt.
Thanks!

David, please apply this patch

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Beregalov 2009-04-10 07:59:24 +00:00 committed by David S. Miller
parent 15efc02b26
commit f97b1f2a41
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/net/ariadne.c
View file

@ -155,6 +155,18 @@ static struct zorro_driver ariadne_driver = {
.remove = __devexit_p(ariadne_remove_one),
};
static const struct net_device_ops ariadne_netdev_ops = {
.ndo_open = ariadne_open,
.ndo_stop = ariadne_close,
.ndo_start_xmit = ariadne_start_xmit,
.ndo_tx_timeout = ariadne_tx_timeout,
.ndo_get_stats = ariadne_get_stats,
.ndo_set_multicast_list = set_multicast_list,
.ndo_validate_addr = eth_validate_addr,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
};
static int __devinit ariadne_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent)
{
@ -197,13 +209,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
dev->mem_start = ZTWO_VADDR(mem_start);
dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE;
dev->open = &ariadne_open;
dev->stop = &ariadne_close;
dev->hard_start_xmit = &ariadne_start_xmit;
dev->tx_timeout = &ariadne_tx_timeout;
dev->netdev_ops = &ariadne_netdev_ops;
dev->watchdog_timeo = 5*HZ;
dev->get_stats = &ariadne_get_stats;
dev->set_multicast_list = &set_multicast_list;
err = register_netdev(dev);
if (err) {