aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-04-07 18:50:41 -0400
committerDavid S. Miller <davem@davemloft.net>2009-04-08 18:58:26 -0400
commit56a007871a6689db80e19f63fe6dc3692daa2a6f (patch)
tree5dcab9ec860910a7518f582403a128908ee6e8fb /drivers/net/netxen/netxen_nic_main.c
parentd877f1e344f5515988d9dcd6db5d4285911778a3 (diff)
netxen: defer firmware handshake
Removed duplicate firmware handshake, defer it until first port (interface) is brought up. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 22b2d491c782..665fce561d4a 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1027,10 +1027,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1027 1027
1028 netxen_napi_add(adapter, netdev); 1028 netxen_napi_add(adapter, netdev);
1029 1029
1030 err = netxen_receive_peg_ready(adapter);
1031 if (err)
1032 goto err_out_disable_msi;
1033
1034 init_timer(&adapter->watchdog_timer); 1030 init_timer(&adapter->watchdog_timer);
1035 adapter->watchdog_timer.function = &netxen_watchdog; 1031 adapter->watchdog_timer.function = &netxen_watchdog;
1036 adapter->watchdog_timer.data = (unsigned long)adapter; 1032 adapter->watchdog_timer.data = (unsigned long)adapter;