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

Commit d5d2bf3e authored by Manish Chopra's avatar Manish Chopra Committed by David S. Miller
Browse files

qlcnic: Fix panic while dumping TX queues on TX timeout 



o In case of non-multi TX queue mode driver does not initialize "crb_intr_mask" pointer
  and driver was accessing that un-initialized pointer while dumping TX queue.
  So dump "crb_intr_mask" only when it is initilaized.

Signed-off-by: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76a691d0

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+6 −2
Original line number Diff line number Diff line
@@ -2943,9 +2943,13 @@ static void qlcnic_dump_tx_rings(struct qlcnic_adapter *adapter) 
			    tx_ring->tx_stats.xmit_called,

			    tx_ring->tx_stats.xmit_on,

			    tx_ring->tx_stats.xmit_off);



		if (tx_ring->crb_intr_mask)

			netdev_info(netdev, "crb_intr_mask=%d\n",

				    readl(tx_ring->crb_intr_mask));



		netdev_info(netdev,

			    "crb_intr_mask=%d, hw_producer=%d, sw_producer=%d sw_consumer=%d, hw_consumer=%d\n",

			    readl(tx_ring->crb_intr_mask),

			    "hw_producer=%d, sw_producer=%d sw_consumer=%d, hw_consumer=%d\n",

			    readl(tx_ring->crb_cmd_producer),

			    tx_ring->producer, tx_ring->sw_consumer,

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