From ce83fabe1aa4d6a764b10e1a6a127a2dc0f55785 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Mon, 26 May 2008 11:31:19 +0300 Subject: [PATCH] --- yaml --- r: 101535 b: refs/heads/master c: 30e9ba9f2001f45960507f1963551311a67d0209 h: refs/heads/master i: 101533: 2ab1ac84297ce5c8d4f8a6561d4081e1f6d266e1 101531: 0370c6f0fc716ee97b5fab6960c796d5f1eb0b8d 101527: 49b2518a0748b34d3b092d55c6d56fbf3b5fa32d 101519: 3912324165f3f9d1caf02a344115b41c93ab1e00 101503: f4cb2de2c1285a70f3af2bedf68e333ca8a9ebe0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/iscsi_tcp.c | 2 +- trunk/include/scsi/iscsi_proto.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ffeb38d513c..5b57acf1f244 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f333991ba8479fe8a9d72aea978db415e3c2f2a +refs/heads/master: 30e9ba9f2001f45960507f1963551311a67d0209 diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c index 7c4ee39a1c43..0bd8b3dc3c19 100644 --- a/trunk/drivers/scsi/iscsi_tcp.c +++ b/trunk/drivers/scsi/iscsi_tcp.c @@ -1864,7 +1864,7 @@ iscsi_tcp_session_create(struct iscsi_endpoint *ep, uint16_t cmds_max, shost->max_lun = iscsi_max_lun; shost->max_id = 0; shost->max_channel = 0; - shost->max_cmd_len = 16; + shost->max_cmd_len = SCSI_MAX_VARLEN_CDB_SIZE; shost->can_queue = cmds_max; if (iscsi_host_add(shost, NULL)) diff --git a/trunk/include/scsi/iscsi_proto.h b/trunk/include/scsi/iscsi_proto.h index e0593bfae622..f2a2c1169486 100644 --- a/trunk/include/scsi/iscsi_proto.h +++ b/trunk/include/scsi/iscsi_proto.h @@ -22,6 +22,7 @@ #define ISCSI_PROTO_H #include +#include #define ISCSI_DRAFT20_VERSION 0x00 @@ -156,7 +157,7 @@ struct iscsi_ecdb_ahdr { uint8_t ahstype; uint8_t reserved; /* 4-byte aligned extended CDB spillover */ - uint8_t ecdb[260 - ISCSI_CDB_SIZE]; + uint8_t ecdb[SCSI_MAX_VARLEN_CDB_SIZE - ISCSI_CDB_SIZE]; }; /* SCSI Response Header */