* [PATCH 1/6] ariadne: convert to net_device_ops
@ 2009-04-10 3:24 Alexander Beregalov
2009-04-10 7:03 ` Geert Uytterhoeven
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alexander Beregalov @ 2009-04-10 3:24 UTC (permalink / raw)
To: netdev, linux-m68k
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
drivers/net/ariadne.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
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) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] ariadne: convert to net_device_ops
2009-04-10 3:24 [PATCH 1/6] ariadne: convert to net_device_ops Alexander Beregalov
@ 2009-04-10 7:03 ` Geert Uytterhoeven
2009-04-10 16:13 ` Jan Ceuleers
2009-04-11 9:44 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2009-04-10 7:03 UTC (permalink / raw)
To: Alexander Beregalov; +Cc: netdev, linux-m68k
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] ariadne: convert to net_device_ops
2009-04-10 3:24 [PATCH 1/6] ariadne: convert to net_device_ops Alexander Beregalov
2009-04-10 7:03 ` Geert Uytterhoeven
@ 2009-04-10 16:13 ` Jan Ceuleers
2009-04-10 17:59 ` Alexander Beregalov
2009-04-11 9:44 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Jan Ceuleers @ 2009-04-10 16:13 UTC (permalink / raw)
To: Alexander Beregalov; +Cc: netdev, linux-m68k
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] ariadne: convert to net_device_ops
2009-04-10 16:13 ` Jan Ceuleers
@ 2009-04-10 17:59 ` Alexander Beregalov
2009-04-11 9:56 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Alexander Beregalov @ 2009-04-10 17:59 UTC (permalink / raw)
To: David Miller, Jan Ceuleers; +Cc: netdev, linux-m68k, Geert Uytterhoeven
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
---
From: Alexander Beregalov <a.beregalov@gmail.com>
Subject: [PATCH 1/6] ariadne: convert to net_device_ops
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/net/ariadne.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index e1d72e0..58e8d52 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) {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] ariadne: convert to net_device_ops
2009-04-10 3:24 [PATCH 1/6] ariadne: convert to net_device_ops Alexander Beregalov
2009-04-10 7:03 ` Geert Uytterhoeven
2009-04-10 16:13 ` Jan Ceuleers
@ 2009-04-11 9:44 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2009-04-11 9:44 UTC (permalink / raw)
To: a.beregalov; +Cc: netdev, linux-m68k
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] ariadne: convert to net_device_ops
2009-04-10 17:59 ` Alexander Beregalov
@ 2009-04-11 9:56 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2009-04-11 9:56 UTC (permalink / raw)
To: a.beregalov; +Cc: jan.ceuleers, netdev, linux-m68k, geert
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Fri, 10 Apr 2009 21:59:24 +0400
> 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
Just FYI I made sure to integrate this fixed up version.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-04-11 9:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-10 3:24 [PATCH 1/6] ariadne: convert to net_device_ops Alexander Beregalov
2009-04-10 7:03 ` Geert Uytterhoeven
2009-04-10 16:13 ` Jan Ceuleers
2009-04-10 17:59 ` Alexander Beregalov
2009-04-11 9:56 ` David Miller
2009-04-11 9:44 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).