git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/futexes
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
ulp
/
iser
/
iser_initiator.c
diff --git
a/drivers/infiniband/ulp/iser/iser_initiator.c
b/drivers/infiniband/ulp/iser/iser_initiator.c
index e209cb8dd9488f32898f2aad155da2c4cd8c8e90..9de640200ad3b61d4b6c05ba9792998a1860faf2 100644
(file)
--- a/
drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/
drivers/infiniband/ulp/iser/iser_initiator.c
@@
-661,7
+661,7
@@
void iser_snd_completion(struct iser_desc *tx_desc)
if (resume_tx) {
iser_dbg("%ld resuming tx\n",jiffies);
-
scsi_queue_work(conn->session->host, &conn->xmitwork
);
+
iscsi_conn_queue_work(conn
);
}
if (tx_desc->type == ISCSI_TX_CONTROL) {