Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 159225
b: refs/heads/master
c: 044824d
h: refs/heads/master
i:
  159223: 43bd141
v: v3
  • Loading branch information
Dhananjay Phadke authored and David S. Miller committed Jul 30, 2009
1 parent bab666c commit ef57a5b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6cf5767c7107c606644503f3e95bc1855386a70f
refs/heads/master: 044824d96208c8ec4863f9c54a529e00a1f1d37c
7 changes: 7 additions & 0 deletions trunk/drivers/net/netxen/netxen_nic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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);
}
Expand All @@ -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);
}

Expand Down

0 comments on commit ef57a5b

Please sign in to comment.