2 files changed, 7 insertions, 15 deletions

diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index 12612127a08..f7d06cbc70a 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -255,19 +255,6 @@ out_free_rq:
 }
 
 static void
-nx_fw_cmd_reset_ctx(struct netxen_adapter *adapter)
-{
-
-        netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION,
-                        adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0,
-                        NX_CDRP_CMD_DESTROY_RX_CTX);
-
-        netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION,
-                        adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0,
-                        NX_CDRP_CMD_DESTROY_TX_CTX);
-}
-
-static void
 nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter)
 {
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
@@ -698,8 +685,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
         if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                 if (test_and_set_bit(__NX_FW_ATTACHED, &adapter->state))
                         goto done;
-                if (reset_devices)
-                        nx_fw_cmd_reset_ctx(adapter);
                 err = nx_fw_cmd_create_rx_ctx(adapter);
                 if (err)
                         goto err_out_free;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 50820beac3a..35ae1aa1289 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1356,6 +1356,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 break;
         }
 
+        if (reset_devices) {
+                if (adapter->portnum == 0) {
+                        NXWR32(adapter, NX_CRB_DEV_REF_COUNT, 0);
+                        adapter->need_fw_reset = 1;
+                }
+        }
+
         err = netxen_start_firmware(adapter);
         if (err)
                 goto err_out_decr_ref;