* [PATCH NEXT] netxen: fix CONFIG_INET=n build
@ 2009-07-28 19:10 Dhananjay Phadke
2009-07-28 19:23 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Dhananjay Phadke @ 2009-07-28 19:10 UTC (permalink / raw)
To: davem; +Cc: netdev, randy.dunlap, linux-kernel, linux-next
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH NEXT] netxen: fix CONFIG_INET=n build
2009-07-28 19:10 [PATCH NEXT] netxen: fix CONFIG_INET=n build Dhananjay Phadke
@ 2009-07-28 19:23 ` Randy Dunlap
2009-07-30 4:42 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2009-07-28 19:23 UTC (permalink / raw)
To: Dhananjay Phadke; +Cc: davem, netdev, linux-kernel, linux-next
On Tue, 28 Jul 2009 12:10:03 -0700 Dhananjay Phadke wrote:
> 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>
Acked-by: Randy Dunlap <randy.dunlap@oracle•com>
Thanks.
> ---
> 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
>
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH NEXT] netxen: fix CONFIG_INET=n build
2009-07-28 19:23 ` Randy Dunlap
@ 2009-07-30 4:42 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-07-30 4:42 UTC (permalink / raw)
To: randy.dunlap; +Cc: dhananjay, netdev, linux-kernel, linux-next
From: Randy Dunlap <randy.dunlap@oracle•com>
Date: Tue, 28 Jul 2009 12:23:52 -0700
> On Tue, 28 Jul 2009 12:10:03 -0700 Dhananjay Phadke wrote:
>
>> 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>
>
> Acked-by: Randy Dunlap <randy.dunlap@oracle•com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-07-30 4:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-28 19:10 [PATCH NEXT] netxen: fix CONFIG_INET=n build Dhananjay Phadke
2009-07-28 19:23 ` Randy Dunlap
2009-07-30 4:42 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox