Message ID | 1371830982-18172-1-git-send-email-jitendra.kalsaria@qlogic.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
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
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); } }