From: Dhananjay Phadke <dhananjay@netxen•com>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, randy.dunlap@oracle•com,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
Subject: [PATCH NEXT] netxen: fix CONFIG_INET=n build
Date: Tue, 28 Jul 2009 12:10:03 -0700 [thread overview]
Message-ID: <1248808203-9578-1-git-send-email-dhananjay@netxen.com> (raw)
Wrap dest IP hashing code with #ifdef CONFIG_INET,
this feature makes no sense without INET, but other
driver can still work.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen•com>
---
drivers/net/netxen/netxen_nic_main.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 2bbefa6..40549a0 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1875,6 +1875,8 @@ static void netxen_nic_poll_controller(struct net_device *netdev)
}
#endif
+#ifdef CONFIG_INET
+
#define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops)
static int
@@ -1993,6 +1995,7 @@ static struct notifier_block netxen_netdev_cb = {
static struct notifier_block netxen_inetaddr_cb = {
.notifier_call = netxen_inetaddr_event,
};
+#endif
static struct pci_driver netxen_driver = {
.name = netxen_nic_driver_name,
@@ -2012,8 +2015,10 @@ static int __init netxen_init_module(void)
if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL)
return -ENOMEM;
+#ifdef CONFIG_INET
register_netdevice_notifier(&netxen_netdev_cb);
register_inetaddr_notifier(&netxen_inetaddr_cb);
+#endif
return pci_register_driver(&netxen_driver);
}
@@ -2024,8 +2029,10 @@ static void __exit netxen_exit_module(void)
{
pci_unregister_driver(&netxen_driver);
+#ifdef CONFIG_INET
unregister_inetaddr_notifier(&netxen_inetaddr_cb);
unregister_netdevice_notifier(&netxen_netdev_cb);
+#endif
destroy_workqueue(netxen_workq);
}
--
1.6.0.2
next reply other threads:[~2009-07-28 19:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-28 19:10 Dhananjay Phadke [this message]
2009-07-28 19:23 ` [PATCH NEXT] netxen: fix CONFIG_INET=n build Randy Dunlap
2009-07-30 4:42 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1248808203-9578-1-git-send-email-dhananjay@netxen.com \
--to=dhananjay@netxen$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=randy.dunlap@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox