diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-17 18:55:57 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-17 18:55:57 (GMT) |
| commit | 74392592bbf7e93ef383588e21aea0c1450d6f12 (patch) | |
| tree | 086981f9ef51d57a34fbc5fde8095652877cf739 /drivers/scsi/iscsi_tcp.c | |
| parent | 17e4d43eb6743a92d7667c822a3c3ecd63a9c58e (diff) | |
| parent | 0f6f49a8cd0163fdb1723ed29f01fc65177108dc (diff) | |
| download | linux-fsl-qoriq-74392592bbf7e93ef383588e21aea0c1450d6f12.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/scsi/iscsi_tcp.c')
| -rw-r--r-- | drivers/scsi/iscsi_tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index b3e5e08..b7c092d 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -463,7 +463,7 @@ static int iscsi_sw_tcp_pdu_init(struct iscsi_task *task, } if (err) { - iscsi_conn_failure(conn, err); + /* got invalid offset/len */ return -EIO; } return 0; @@ -851,6 +851,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { .use_clustering = DISABLE_CLUSTERING, .slave_alloc = iscsi_sw_tcp_slave_alloc, .slave_configure = iscsi_sw_tcp_slave_configure, + .target_alloc = iscsi_target_alloc, .proc_name = "iscsi_tcp", .this_id = -1, }; |