diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/scsi/iscsi_tcp.c | |
parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/scsi/iscsi_tcp.c')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 2b1b834a098b..edc49ca49cea 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -811,7 +811,7 @@ iscsi_sw_tcp_session_create(struct iscsi_endpoint *ep, uint16_t cmds_max, | |||
811 | goto free_host; | 811 | goto free_host; |
812 | 812 | ||
813 | cls_session = iscsi_session_setup(&iscsi_sw_tcp_transport, shost, | 813 | cls_session = iscsi_session_setup(&iscsi_sw_tcp_transport, shost, |
814 | cmds_max, | 814 | cmds_max, 0, |
815 | sizeof(struct iscsi_tcp_task) + | 815 | sizeof(struct iscsi_tcp_task) + |
816 | sizeof(struct iscsi_sw_tcp_hdrbuf), | 816 | sizeof(struct iscsi_sw_tcp_hdrbuf), |
817 | initial_cmdsn, 0); | 817 | initial_cmdsn, 0); |