projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b90fc27
)
qlcnic: Do not sleep while holding spinlock
author
Shahed Shaikh
<
[email protected]
>
Fri, 21 Jun 2013 16:09:42 +0000
(12:09 -0400)
committer
David S. Miller
<
[email protected]
>
Mon, 24 Jun 2013 07:28:28 +0000
(
00:28
-0700)
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 <
[email protected]
>
Signed-off-by: Jitendra Kalsaria <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 43562c256379539b8f739d4b72950886c067b75e..6acf82b9f01894d7c7e3e885e6f5cbc5760f3797 100644
(file)
--- 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 */
- m
sleep
(20);
+ m
delay
(20);
}
}