Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f97b1f2a authored by Alexander Beregalov's avatar Alexander Beregalov Committed by David S. Miller
Browse files

ariadne: convert to net_device_ops 



On Fri, Apr 10, 2009 at 06:13:54PM +0200, Jan Ceuleers wrote:
> Alexander Beregalov wrote:
> >
> > Signed-off-by: default avatarAlexander 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 15efc02b

drivers/net/ariadne.c

+13 −6
Original line number Diff line number Diff line
@@ -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) {