| Message ID | 1252019455-30683-2-git-send-email-dhananjay@netxen.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Dhananjay Phadke <dhananjay@netxen.com> Date: Thu, 3 Sep 2009 16:10:54 -0700 > Remove duplicate calls to netxen_napi_add(). > > Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Applied, but: > @@ -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) Give me a friggin' break, really. If you're going to slip unrelated cleanups like this into your patches, at least DOCUMENT them in the commit message. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index f824a39..53d57dc 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)
Remove duplicate calls to netxen_napi_add(). Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> --- drivers/net/netxen/netxen_nic_main.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)