Message ID | 20090410032407.GA9004@orion |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, Apr 10, 2009 at 05:24, Alexander Beregalov <a.beregalov@gmail.com> wrote: > Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. Cheers, Jan -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Alexander Beregalov <a.beregalov@gmail.com> Date: Fri, 10 Apr 2009 07:24:07 +0400 > > > Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index e1d72e0..6c5826a 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c @@ -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) {
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> --- drivers/net/ariadne.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html