diff options
author | Rajesh K Borundia <rajesh.borundia@qlogic.com> | 2010-06-16 22:56:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-17 11:57:56 -0400 |
commit | ef71ff833acfd3795c3af1bb800ac186561508ef (patch) | |
tree | fa285765677574d4aafb42c9fbbc32443a8e4597 /drivers/net/qlcnic/qlcnic_init.c | |
parent | 8f891387aa73b85d2ea8d953e04dac224f687e52 (diff) |
qlcnic: fix race in tx stop queue
There is a race between netif_stop_queue and netif_stopped_queue
check. So check once again if buffers are available to avoid race.
With above logic we can also get rid of tx lock in process_cmd_ring.
Signed-off-by: Rajesh K Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_init.c')
-rw-r--r-- | drivers/net/qlcnic/qlcnic_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index 2bd00d54dd3f..058ce61501c3 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c | |||
@@ -181,7 +181,9 @@ skip_rds: | |||
181 | 181 | ||
182 | tx_ring = adapter->tx_ring; | 182 | tx_ring = adapter->tx_ring; |
183 | vfree(tx_ring->cmd_buf_arr); | 183 | vfree(tx_ring->cmd_buf_arr); |
184 | tx_ring->cmd_buf_arr = NULL; | ||
184 | kfree(adapter->tx_ring); | 185 | kfree(adapter->tx_ring); |
186 | adapter->tx_ring = NULL; | ||
185 | } | 187 | } |
186 | 188 | ||
187 | int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) | 189 | int qlcnic_alloc_sw_resources(struct qlcnic_adapter *adapter) |