[PATCH] mac8390: fix regression caused during net_device_ops conversion

[PATCH] mac8390: fix regression caused during net_device_ops conversion

[Finn Thain]

Changeset ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc broke mac8390 by adding 
8390.o to the link. That meant that lib8390.c was included twice, once in 
mac8390.c and once in 8390.c, subject to different macros. This patch 
reverts that by avoiding the wrappers in 8390.c. They seem to be of no 
value since COMPAT_NET_DEV_OPS is going away soon.

Tested with a Kinetics EtherPort card.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

---

Resent with netdev list CC'd as requested.


--- linux-2.6.29.orig/drivers/net/Makefile	2009-05-25 23:52:32.000000000 +1000
+++ linux-2.6.29/drivers/net/Makefile	2009-05-25 23:41:36.000000000 +1000
@@ -100,7 +100,7 @@
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_MAC8390) += mac8390.o 8390.o
+obj-$(CONFIG_MAC8390) += mac8390.o
 obj-$(CONFIG_APNE) += apne.o 8390.o
 obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
 obj-$(CONFIG_HP100) += hp100.o
--- linux-2.6.29.orig/drivers/net/mac8390.c	2009-03-24 10:12:14.000000000 +1100
+++ linux-2.6.29/drivers/net/mac8390.c	2009-05-25 23:44:28.000000000 +1000
@@ -304,7 +304,7 @@
 	if (!MACH_IS_MAC)
 		return ERR_PTR(-ENODEV);
 
-	dev = alloc_ei_netdev();
+	dev = ____alloc_ei_netdev(0);
 	if (!dev)
 		return ERR_PTR(-ENOMEM);
 
@@ -481,10 +481,10 @@
 static const struct net_device_ops mac8390_netdev_ops = {
 	.ndo_open 		= mac8390_open,
 	.ndo_stop		= mac8390_close,
-	.ndo_start_xmit		= ei_start_xmit,
-	.ndo_tx_timeout		= ei_tx_timeout,
-	.ndo_get_stats		= ei_get_stats,
-	.ndo_set_multicast_list = ei_set_multicast_list,
+	.ndo_start_xmit		= __ei_start_xmit,
+	.ndo_tx_timeout		= __ei_tx_timeout,
+	.ndo_get_stats		= __ei_get_stats,
+	.ndo_set_multicast_list = __ei_set_multicast_list,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_change_mtu		= eth_change_mtu,

Re: [PATCH] mac8390: fix regression caused during net_device_ops conversion

[David Miller]

From: Finn Thain <fthain@telegraphics.com.au>
Date: Tue, 26 May 2009 12:50:12 +1000 (EST)

> 
> Changeset ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc broke mac8390 by adding 
> 8390.o to the link. That meant that lib8390.c was included twice, once in 
> mac8390.c and once in 8390.c, subject to different macros. This patch 
> reverts that by avoiding the wrappers in 8390.c. They seem to be of no 
> value since COMPAT_NET_DEV_OPS is going away soon.
> 
> Tested with a Kinetics EtherPort card.
> 
> Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

Patch applied, thanks.

Re: [PATCH] mac8390: fix regression caused during net_device_ops conversion, take 2

[Finn Thain]

Changeset ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc broke mac8390 by adding 
8390.o to the link. That meant that lib8390.c was included twice, once in 
mac8390.c and once in 8390.c, subject to different macros. This patch 
reverts that by avoiding the wrappers in 8390.c. They seem to be of no 
value since COMPAT_NET_DEV_OPS is going away soon.

Tested with a Kinetics EtherPort card.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

---

Take 2: this one should make CONFIG_NET_POLL_CONTROLLER=y buildable again. 
Sorry about that.


--- linux-2.6.29.orig/drivers/net/Makefile	2009-05-28 15:15:13.000000000 +1000
+++ linux-2.6.29/drivers/net/Makefile	2009-05-28 15:15:54.000000000 +1000
@@ -304,7 +304,7 @@
 	if (!MACH_IS_MAC)
 		return ERR_PTR(-ENODEV);
 
-	dev = alloc_ei_netdev();
+	dev = ____alloc_ei_netdev(0);
 	if (!dev)
 		return ERR_PTR(-ENOMEM);
 
@@ -481,15 +481,15 @@
 static const struct net_device_ops mac8390_netdev_ops = {
 	.ndo_open 		= mac8390_open,
 	.ndo_stop		= mac8390_close,
-	.ndo_start_xmit		= ei_start_xmit,
-	.ndo_tx_timeout		= ei_tx_timeout,
-	.ndo_get_stats		= ei_get_stats,
-	.ndo_set_multicast_list = ei_set_multicast_list,
+	.ndo_start_xmit		= __ei_start_xmit,
+	.ndo_tx_timeout		= __ei_tx_timeout,
+	.ndo_get_stats		= __ei_get_stats,
+	.ndo_set_multicast_list = __ei_set_multicast_list,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_change_mtu		= eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	.ndo_poll_controller	= ei_poll,
+	.ndo_poll_controller	= __ei_poll,
 #endif
 };
 

Re: [PATCH] mac8390: fix regression caused during net_device_ops conversion, take 2

[David Miller]

From: Finn Thain <fthain@telegraphics.com.au>
Date: Thu, 28 May 2009 15:26:43 +1000 (EST)

> 
> Changeset ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc broke mac8390 by adding 
> 8390.o to the link. That meant that lib8390.c was included twice, once in 
> mac8390.c and once in 8390.c, subject to different macros. This patch 
> reverts that by avoiding the wrappers in 8390.c. They seem to be of no 
> value since COMPAT_NET_DEV_OPS is going away soon.
> 
> Tested with a Kinetics EtherPort card.
> 
> Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

I already applied your other patch, it's in Linus's tree already
in fact.

So you need to send something relative to that.

[PATCH] mac8390: fix build with NET_POLL_CONTROLLER

[Finn Thain]

Fix the build for CONFIG_NET_POLL_CONTROLLER that I broke with
217cbfa856dc1cbc2890781626c4032d9e3ec59f.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

--- linux-2.6.29.orig/drivers/net/Makefile	2009-05-28 15:15:13.000000000 +1000
+++ linux-2.6.29/drivers/net/Makefile	2009-05-28 15:15:54.000000000 +1000
@@ -489,7 +489,7 @@
 	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_change_mtu		= eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	.ndo_poll_controller	= ei_poll,
+	.ndo_poll_controller	= __ei_poll,
 #endif
 };
 

Re: [PATCH] mac8390: fix build with NET_POLL_CONTROLLER

[David Miller]

From: Finn Thain <fthain@telegraphics.com.au>
Date: Thu, 28 May 2009 22:05:53 +1000 (EST)

> --- linux-2.6.29.orig/drivers/net/Makefile	2009-05-28 15:15:13.000000000 +1000
> +++ linux-2.6.29/drivers/net/Makefile	2009-05-28 15:15:54.000000000 +1000
> @@ -489,7 +489,7 @@
>  	.ndo_set_mac_address 	= eth_mac_addr,
>  	.ndo_change_mtu		= eth_change_mtu,
>  #ifdef CONFIG_NET_POLL_CONTROLLER
> -	.ndo_poll_controller	= ei_poll,
> +	.ndo_poll_controller	= __ei_poll,
>  #endif
>  };

I don't think this is a patch to drivers/net/Makefile :-)

I've seen some patch screwups in my time, but this one
takes the cake as one of the most impressive ones :-)

I'll fix it up by hand, but realize that this makes more
work for me.

Re: [PATCH] mac8390: fix build with NET_POLL_CONTROLLER

[Jiri Pirko]

Fri, May 29, 2009 at 10:56:08AM CEST, davem@davemloft.net wrote:
>From: Finn Thain <fthain@telegraphics.com.au>
>Date: Thu, 28 May 2009 22:05:53 +1000 (EST)
>
>> --- linux-2.6.29.orig/drivers/net/Makefile	2009-05-28 15:15:13.000000000 +1000
>> +++ linux-2.6.29/drivers/net/Makefile	2009-05-28 15:15:54.000000000 +1000
>> @@ -489,7 +489,7 @@
>>  	.ndo_set_mac_address 	= eth_mac_addr,
>>  	.ndo_change_mtu		= eth_change_mtu,
>>  #ifdef CONFIG_NET_POLL_CONTROLLER
>> -	.ndo_poll_controller	= ei_poll,
>> +	.ndo_poll_controller	= __ei_poll,
>>  #endif
>>  };
>
>I don't think this is a patch to drivers/net/Makefile :-)
:)) Good one.. I wonder how this can happen ;)
>
>I've seen some patch screwups in my time, but this one
>takes the cake as one of the most impressive ones :-)
>
>I'll fix it up by hand, but realize that this makes more
>work for me.
>--
>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

Re: [PATCH] mac8390: fix build with NET_POLL_CONTROLLER

[Finn Thain]

On Fri, 29 May 2009, Jiri Pirko wrote:

> Fri, May 29, 2009 at 10:56:08AM CEST, davem@davemloft.net wrote:
> >From: Finn Thain <fthain@telegraphics.com.au>
> >Date: Thu, 28 May 2009 22:05:53 +1000 (EST)
> >
> >> --- linux-2.6.29.orig/drivers/net/Makefile	2009-05-28 15:15:13.000000000 +1000
> >> +++ linux-2.6.29/drivers/net/Makefile	2009-05-28 15:15:54.000000000 +1000
> >> @@ -489,7 +489,7 @@
> >>  	.ndo_set_mac_address 	= eth_mac_addr,
> >>  	.ndo_change_mtu		= eth_change_mtu,
> >>  #ifdef CONFIG_NET_POLL_CONTROLLER
> >> -	.ndo_poll_controller	= ei_poll,
> >> +	.ndo_poll_controller	= __ei_poll,
> >>  #endif
> >>  };
> >
> >I don't think this is a patch to drivers/net/Makefile :-)
> :)) Good one.. I wonder how this can happen ;)


*blush*

It happens like this... imagine you are using someone else's computer, you 
have a simple one line patch to fix, and can't be bothered downloading 69 
MB of source... (let alone git clone)

$ vi p
$ curl 'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=drivers/net/lib8390.c;h=789b6cb744b284ee08d4c749ab9fa210dc34170e' >m
$ patch <p
can't find file to patch at input line 8
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|
|Fix the build for CONFIG_NET_POLL_CONTROLLER.
|
|Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
|
|--- linux-2.6.29.orig/drivers/net/Makefile	2009-05-28 15:15:13.000000000 +1000
|+++ linux-2.6.29/drivers/net/Makefile	2009-05-28 15:15:54.000000000 +1000
--------------------------
File to patch: m
patching file m
$

> >
> >I've seen some patch screwups in my time, but this one
> >takes the cake as one of the most impressive ones :-)
> >
> >I'll fix it up by hand, but realize that this makes more
> >work for me.

Thanks. I'd hate to screw it up a 4th time!

I'll avoid shortcuts next time.

Finn