Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15eef1e1 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by Jeff Garzik
Browse files

netxen: fix dma watchdog 



NX3031 does not require driver to kill dma watchdog.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 922c4f2c

drivers/net/netxen/netxen_nic_init.c

+15 −13
Original line number Diff line number Diff line
@@ -1079,10 +1079,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter) 


void netxen_free_adapter_offload(struct netxen_adapter *adapter)

{

	int i;

	int i = 100;



	if (!adapter->dummy_dma.addr)

		return;



	if (adapter->dummy_dma.addr) {

		i = 100;

	if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {

		do {

			if (dma_watchdog_shutdown_request(adapter) == 1)

				break;
@@ -1090,6 +1092,7 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter) 
			if (dma_watchdog_shutdown_poll_result(adapter) == 1)

				break;

		} while (--i);

	}



	if (i) {

		pci_free_consistent(adapter->pdev,
@@ -1102,7 +1105,6 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter) 
				adapter->netdev->name);

	}

}

}



int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)

{