Skip to contentSkip to conversation

netxen: build fix for INET=n

PATCH Applied Randy Dunlap 3 participants 3 messages Sep 11, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netxen: build fix for INET=n

From: Randy Dunlap <[email protected]>

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)

---
 drivers/net/netxen/netxen_nic_main.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/net/netxen/netxen_nic_main.c +4 -0
@@ -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/

Acked-by on v1 1/1
#1 lore raw

grr .. I broke it again!

Thanks Randy for fixing.

Quoted 35 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

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)

---
 drivers/net/netxen/netxen_nic_main.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/net/netxen/netxen_nic_main.c +4 -1
@@ -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/

maintainer Applied
#2 lore raw

From: Dhananjay Phadke <[email protected]>
Date: Fri, 11 Sep 2009 15:46:29 -0700

Quoted 3 lines

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.

Quoted 1 line

Applied, thanks everyone.