From: Dhananjay Phadke Date: Thu, 3 Sep 2009 13:10:54 +0000 (+0000) Subject: netxen: remove duplicate napi_add X-Git-Tag: MMI-PSA29.97-13-9~26976^2~106 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git netxen: remove duplicate napi_add Remove duplicate calls to netxen_napi_add(). Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller --- 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)