diff options
author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-09-03 09:10:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-03 23:02:01 -0400 |
commit | 270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1 (patch) | |
tree | a93b7dd4bdc0e8d61ccdbcf41e1001150d5ba846 /drivers/net/netxen | |
parent | bc75e5bfad2a6d24fc5a9885a2f6b93f82c6c5f1 (diff) |
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, | |||
1095 | 1095 | ||
1096 | netdev->irq = adapter->msix_entries[0].vector; | 1096 | netdev->irq = adapter->msix_entries[0].vector; |
1097 | 1097 | ||
1098 | err = netxen_napi_add(adapter, netdev); | ||
1099 | if (err) | ||
1100 | return err; | ||
1101 | |||
1102 | init_timer(&adapter->watchdog_timer); | 1098 | init_timer(&adapter->watchdog_timer); |
1103 | adapter->watchdog_timer.function = &netxen_watchdog; | 1099 | adapter->watchdog_timer.function = &netxen_watchdog; |
1104 | adapter->watchdog_timer.data = (unsigned long)adapter; | 1100 | adapter->watchdog_timer.data = (unsigned long)adapter; |
@@ -2038,8 +2034,6 @@ netxen_remove_sysfs_entries(struct netxen_adapter *adapter) | |||
2038 | device_remove_file(dev, &dev_attr_bridged_mode); | 2034 | device_remove_file(dev, &dev_attr_bridged_mode); |
2039 | } | 2035 | } |
2040 | 2036 | ||
2041 | static void netxen_watchdog(unsigned long); | ||
2042 | |||
2043 | #ifdef CONFIG_INET | 2037 | #ifdef CONFIG_INET |
2044 | 2038 | ||
2045 | #define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops) | 2039 | #define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops) |