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

Commit 240b23c4 authored by Tony Camuso's avatar Tony Camuso Committed by David S. Miller
Browse files

netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2) 

This patch should have been part of the previous patch having the
same summary. See  http://marc.info/?l=linux-kernel&m=143039470103795&w=2


Unfortunately, I didn't check to see where else this lock was used before
submitting that patch. This should take care of it for netxen_nic, as I
did a thorough search this time.

To recap from the original patch; although testing this driver with
DEBUG_LOCKDEP and DEBUG_SPINLOCK enabled did not produce any traces,
it would be more prudent in the case of tx_clean_lock to use _bh
versions of spin_[un]lock, since this lock is manipulated in both
the process and softirq contexts.

This patch was tested for functionality and regressions with netperf
and DEBUG_LOCKDEP and DEBUG_SPINLOCK enabled.

Signed-off-by: default avatarTony Camuso <tcamuso@redhat.com>
Acked-By: default avatarNeil Horman <nhorman@tuxdriver.com>
Acked-By: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ccad725c

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

+2 −2
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter) 
	int done = 0;

	struct nx_host_tx_ring *tx_ring = adapter->tx_ring;



	if (!spin_trylock(&adapter->tx_clean_lock))

	if (!spin_trylock_bh(&adapter->tx_clean_lock))

		return 1;



	sw_consumer = tx_ring->sw_consumer;
@@ -1819,7 +1819,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter) 
	 */

	hw_consumer = le32_to_cpu(*(tx_ring->hw_consumer));

	done = (sw_consumer == hw_consumer);

	spin_unlock(&adapter->tx_clean_lock);

	spin_unlock_bh(&adapter->tx_clean_lock);



	return done;

}