Patchwork [net,1/1] qlcnic: Do not sleep while holding spinlock

login
register
mail settings
Submitter Jitendra Kalsaria
Date June 21, 2013, 4:09 p.m.
Message ID <1371830982-18172-1-git-send-email-jitendra.kalsaria@qlogic.com>
Download mbox | patch
Permalink /patch/253268/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jitendra Kalsaria - June 21, 2013, 4:09 p.m.
From: Shahed Shaikh <shahed.shaikh@qlogic.com>

This patch reverts commit a4791254b6625b06aa33e36304f6e8a1a4a1fdea
("qlcnic: change mdelay to msleep") which overwrote a commit
68b3f28c11bf896be32ad2a2e151aaa5f4a7c98e
("qlcnic: Fix scheduling while atomic bug")

Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - June 24, 2013, 7:29 a.m.
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Date: Fri, 21 Jun 2013 12:09:42 -0400

> From: Shahed Shaikh <shahed.shaikh@qlogic.com>
> 
> This patch reverts commit a4791254b6625b06aa33e36304f6e8a1a4a1fdea
> ("qlcnic: change mdelay to msleep") which overwrote a commit
> 68b3f28c11bf896be32ad2a2e151aaa5f4a7c98e
> ("qlcnic: Fix scheduling while atomic bug")
> 
> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
> Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 43562c2..6acf82b 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -642,7 +642,7 @@  void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
 				qlcnic_83xx_config_intrpt(adapter, 0);
 		}
 		/* Allow dma queues to drain after context reset */
-		msleep(20);
+		mdelay(20);
 	}
 }