* [PATCH net 1/1] qlcnic: Do not sleep while holding spinlock
@ 2013-06-21 16:09 Jitendra Kalsaria
2013-06-24 7:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jitendra Kalsaria @ 2013-06-21 16:09 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, shahed.shaikh, Dept_NX_Linux_NIC_Driver
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(-)
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);
}
}
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net 1/1] qlcnic: Do not sleep while holding spinlock
2013-06-21 16:09 [PATCH net 1/1] qlcnic: Do not sleep while holding spinlock Jitendra Kalsaria
@ 2013-06-24 7:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-06-24 7:29 UTC (permalink / raw)
To: jitendra.kalsaria
Cc: netdev, sony.chacko, shahed.shaikh, Dept_NX_Linux_NIC_Driver
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-24 7:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-21 16:09 [PATCH net 1/1] qlcnic: Do not sleep while holding spinlock Jitendra Kalsaria
2013-06-24 7:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).