diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-09-03 17:10:54 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-04 07:02:01 +0400 |
commit | 270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1 (patch) | |
tree | a93b7dd4bdc0e8d61ccdbcf41e1001150d5ba846 /drivers/net/netxen | |
parent | bc75e5bfad2a6d24fc5a9885a2f6b93f82c6c5f1 (diff) | |
download | linux-270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1.tar.xz |
netxen: remove duplicate napi_add
Remove duplicate calls to netxen_napi_add().
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index f824a392bf56..53d57dc4d644 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1095,10 +1095,6 @@ netxen_setup_netdev(struct netxen_adapter *adapter, netdev->irq = adapter->msix_entries[0].vector; - err = netxen_napi_add(adapter, netdev); - if (err) - return err; - init_timer(&adapter->watchdog_timer); adapter->watchdog_timer.function = &netxen_watchdog; adapter->watchdog_timer.data = (unsigned long)adapter; @@ -2038,8 +2034,6 @@ netxen_remove_sysfs_entries(struct netxen_adapter *adapter) device_remove_file(dev, &dev_attr_bridged_mode); } -static void netxen_watchdog(unsigned long); - #ifdef CONFIG_INET #define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops) |