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

Commit 37b9a267 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netxen' 



Manish Chopra says:

====================
netxen: Bug fixes.

This series fixes some TX specific issues.
* Move spin_lock(tx_clean_lock) in down path to fix
  atomic sleep bug (Reported by Mike Galbraith).
* Fix hang in interface down while running traffic.

Please consider applying this to 'net'.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 705f1c86 9295f940

drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -135,6 +135,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter) 
	int i, j;

	int i, j;

	struct nx_host_tx_ring *tx_ring = adapter->tx_ring;

	struct nx_host_tx_ring *tx_ring = adapter->tx_ring;





	spin_lock(&adapter->tx_clean_lock);

	cmd_buf = tx_ring->cmd_buf_arr;

	cmd_buf = tx_ring->cmd_buf_arr;

	for (i = 0; i < tx_ring->num_desc; i++) {

	for (i = 0; i < tx_ring->num_desc; i++) {

		buffrag = cmd_buf->frag_array;

		buffrag = cmd_buf->frag_array;
@@ -158,6 +159,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter) 
		}

		}

		cmd_buf++;

		cmd_buf++;

	}

	}

	spin_unlock(&adapter->tx_clean_lock);

}

}





void netxen_free_sw_resources(struct netxen_adapter *adapter)

void netxen_free_sw_resources(struct netxen_adapter *adapter)
@@ -1792,9 +1794,9 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter) 
			break;

			break;

	}

	}





	if (count && netif_running(netdev)) {

	tx_ring->sw_consumer = sw_consumer;

	tx_ring->sw_consumer = sw_consumer;





	if (count && netif_running(netdev)) {

		smp_mb();

		smp_mb();





		if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev))

		if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev))

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1186,7 +1186,6 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev) 
		return;

		return;





	smp_mb();

	smp_mb();

	spin_lock(&adapter->tx_clean_lock);

	netif_carrier_off(netdev);

	netif_carrier_off(netdev);

	netif_tx_disable(netdev);

	netif_tx_disable(netdev);
@@ -1204,7 +1203,6 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev) 
	netxen_napi_disable(adapter);

	netxen_napi_disable(adapter);





	netxen_release_tx_buffers(adapter);

	netxen_release_tx_buffers(adapter);

	spin_unlock(&adapter->tx_clean_lock);

}

}





/* Usage: During suspend and firmware recovery module */

/* Usage: During suspend and firmware recovery module */