[PATCH -next] netxen: build fix for INET=n

[PATCH -next] netxen: build fix for INET=n

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

When CONFIG_INET is disabled, netxen has a build failure:

netxen_nic_main.c:(.text+0x118fd1): undefined reference to `netxen_config_indev_addr'

so make that function just an empty stub when CONFIG_INET=n.
(not "inline" since that conflicts with other declarations of it)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/net/netxen/netxen_nic_main.c |    4 ++++
 1 file changed, 4 insertions(+)

--- linux-next-20090911.orig/drivers/net/netxen/netxen_nic_main.c
+++ linux-next-20090911/drivers/net/netxen/netxen_nic_main.c
@@ -2450,6 +2450,10 @@ static struct notifier_block	netxen_netd
 static struct notifier_block netxen_inetaddr_cb = {
 	.notifier_call = netxen_inetaddr_event,
 };
+#else
+static void
+netxen_config_indev_addr(struct net_device *dev, unsigned long event)
+{ }
 #endif
 
 static struct pci_driver netxen_driver = {




---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

Re: [PATCH -next] netxen: build fix for INET=n

[Dhananjay Phadke]

grr .. I broke it again!

Thanks Randy for fixing.

Acked-by: Dhananjay Phadke <dhananjay@netxen.com>

Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> When CONFIG_INET is disabled, netxen has a build failure:
> 
> netxen_nic_main.c:(.text+0x118fd1): undefined reference to `netxen_config_indev_addr'
> 
> so make that function just an empty stub when CONFIG_INET=n.
> (not "inline" since that conflicts with other declarations of it)
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
>  drivers/net/netxen/netxen_nic_main.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> --- linux-next-20090911.orig/drivers/net/netxen/netxen_nic_main.c
> +++ linux-next-20090911/drivers/net/netxen/netxen_nic_main.c
> @@ -2450,6 +2450,10 @@ static struct notifier_block	netxen_netd
>  static struct notifier_block netxen_inetaddr_cb = {
>  	.notifier_call = netxen_inetaddr_event,
>  };
> +#else
> +static void
> +netxen_config_indev_addr(struct net_device *dev, unsigned long event)
> +{ }
>  #endif
>  
>  static struct pci_driver netxen_driver = {
> 
> 
> 
> 
> ---
> ~Randy
> LPC 2009, Sept. 23-25, Portland, Oregon
> http://linuxplumbersconf.org/2009/

Re: [PATCH -next] netxen: build fix for INET=n

[David Miller]

From: Dhananjay Phadke <dhananjay.phadke@qlogic.com>
Date: Fri, 11 Sep 2009 15:46:29 -0700

> grr .. I broke it again!
> 
> Thanks Randy for fixing.

Please don't top post, put your replies underneath the quoted
content so people read the context of what you're replying
to and then see your reply, not the other way around.

Thanks.

> Acked-by: Dhananjay Phadke <dhananjay@netxen.com>

Applied, thanks everyone.