git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_os.c
diff --git
a/drivers/scsi/qla2xxx/qla_os.c
b/drivers/scsi/qla2xxx/qla_os.c
index
dd5aaba
..
591f1d5
100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_os.c
+++ b/
drivers/scsi/qla2xxx/qla_os.c
@@
-1663,7
+1663,7
@@
qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
goto out;
/* Waiting for our command in done_queue to be returned to OS.*/
goto out;
/* Waiting for our command in done_queue to be returned to OS.*/
- if (qla2x00_eh_wait_for_pending_commands(ha))
+ if (
!
qla2x00_eh_wait_for_pending_commands(ha))
rval = FAILED;
out:
rval = FAILED;
out:
@@
-1784,7
+1784,7
@@
qla2xxx_slave_configure(struct scsi_device *sdev)
ql2xmaxqdepth = queue_depth;
ql2xmaxqdepth = queue_depth;
- scsi_a
djust_queue_depth(sdev, MSG_ORDERED_TAG
, queue_depth);
+ scsi_a
ctivate_tcq(sdev
, queue_depth);
qla_printk(KERN_INFO, ha,
"scsi(%d:%d:%d:%d): Enabled tagged queuing, queue "
qla_printk(KERN_INFO, ha,
"scsi(%d:%d:%d:%d): Enabled tagged queuing, queue "
@@
-3590,7
+3590,7
@@
qla2x00_get_new_sp(scsi_qla_host_t *ha)
{
srb_t *sp;
{
srb_t *sp;
- sp = mempool_alloc(ha->srb_mempool, GFP_
KERNEL
);
+ sp = mempool_alloc(ha->srb_mempool, GFP_
ATOMIC
);
if (sp)
atomic_set(&sp->ref_count, 1);
return (sp);
if (sp)
atomic_set(&sp->ref_count, 1);
return (sp);
@@
-4517,3
+4517,4
@@
module_exit(qla2x00_module_exit);
MODULE_AUTHOR("QLogic Corporation");
MODULE_DESCRIPTION("QLogic Fibre Channel HBA Driver");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("QLogic Corporation");
MODULE_DESCRIPTION("QLogic Fibre Channel HBA Driver");
MODULE_LICENSE("GPL");
+MODULE_VERSION(QLA2XXX_VERSION);