[PATCH 2.6.27-rc1]: fix NE2000 linkage error

[PATCH 2.6.27-rc1]: fix NE2000 linkage error

[Mikael Pettersson]

Trying to build with CONFIG_NE2000=m fails with:

  scripts/mod/modpost   -o /tmp/tmp/linux-2.6.27-rc1/Module.symvers    -S     -s
ERROR: "NS8390_init" [drivers/net/ne.ko] undefined!

This is because the split of 8390 into pausing and non-pausing
versions was incompletely propagated to ne.c. This fixes it.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
---

--- linux-2.6.27-rc1/drivers/net/ne.c.~1~	2008-07-29 10:40:11.000000000 +0200
+++ linux-2.6.27-rc1/drivers/net/ne.c	2008-07-30 13:17:16.000000000 +0200
@@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_d
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	dev->poll_controller = eip_poll;
 #endif
-	NS8390_init(dev, 0);
+	NS8390p_init(dev, 0);
 
 	ret = register_netdev(dev);
 	if (ret)
@@ -794,7 +794,7 @@ retry:
 		if (time_after(jiffies, dma_start + 2*HZ/100)) {		/* 20ms */
 			printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
 			ne_reset_8390(dev);
-			NS8390_init(dev,1);
+			NS8390p_init(dev, 1);
 			break;
 		}
 
@@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform
 
 	if (netif_running(dev)) {
 		ne_reset_8390(dev);
-		NS8390_init(dev, 1);
+		NS8390p_init(dev, 1);
 		netif_device_attach(dev);
 	}
 	return 0;

Re: [PATCH 2.6.27-rc1]: fix NE2000 linkage error

[Alan Cox]

On Wed, 30 Jul 2008 13:44:55 +0200 (MEST)
Mikael Pettersson <mikpe@it.uu.se> wrote:

> Trying to build with CONFIG_NE2000=m fails with:

Yes I've sent patches to fix this to Jeff a couple of times.

Alan

Re: [PATCH 2.6.27-rc1]: fix NE2000 linkage error

[Jeff Garzik]

Mikael Pettersson wrote:
> Trying to build with CONFIG_NE2000=m fails with:
> 
>   scripts/mod/modpost   -o /tmp/tmp/linux-2.6.27-rc1/Module.symvers    -S     -s
> ERROR: "NS8390_init" [drivers/net/ne.ko] undefined!
> 
> This is because the split of 8390 into pausing and non-pausing
> versions was incompletely propagated to ne.c. This fixes it.
> 
> Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
> ---
> 
> --- linux-2.6.27-rc1/drivers/net/ne.c.~1~	2008-07-29 10:40:11.000000000 +0200
> +++ linux-2.6.27-rc1/drivers/net/ne.c	2008-07-30 13:17:16.000000000 +0200
> @@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_d
>  #ifdef CONFIG_NET_POLL_CONTROLLER
>  	dev->poll_controller = eip_poll;
>  #endif
> -	NS8390_init(dev, 0);
> +	NS8390p_init(dev, 0);
>  
>  	ret = register_netdev(dev);
>  	if (ret)
> @@ -794,7 +794,7 @@ retry:
>  		if (time_after(jiffies, dma_start + 2*HZ/100)) {		/* 20ms */
>  			printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
>  			ne_reset_8390(dev);
> -			NS8390_init(dev,1);
> +			NS8390p_init(dev, 1);
>  			break;
>  		}
>  
> @@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform
>  
>  	if (netif_running(dev)) {
>  		ne_reset_8390(dev);
> -		NS8390_init(dev, 1);
> +		NS8390p_init(dev, 1);
>  		netif_device_attach(dev);

Yep, already got this one, but thanks!

Re: [PATCH 2.6.27-rc1]: fix NE2000 linkage error

[Jeff Garzik]

Mikael Pettersson wrote:
> Trying to build with CONFIG_NE2000=m fails with:
> 
>   scripts/mod/modpost   -o /tmp/tmp/linux-2.6.27-rc1/Module.symvers    -S     -s
> ERROR: "NS8390_init" [drivers/net/ne.ko] undefined!
> 
> This is because the split of 8390 into pausing and non-pausing
> versions was incompletely propagated to ne.c. This fixes it.
> 
> Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>

actually, I take that back, I still needed a bit of this.  thanks