|
 |
5ebdd59 |
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/be2iscsi.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/be2iscsi.c
|
|
|
5ebdd59 |
--- open-iscsi-2.0-872-rc1-bnx2i/usr/be2iscsi.c 2010-04-16 14:15:44.000000000 -0500
|
|
|
5ebdd59 |
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/be2iscsi.c 2010-04-16 14:17:00.000000000 -0500
|
|
|
5ebdd59 |
@@ -18,6 +18,9 @@
|
|
|
5ebdd59 |
|
|
|
5ebdd59 |
void be2iscsi_create_conn(struct iscsi_conn *conn)
|
|
|
5ebdd59 |
{
|
|
|
5ebdd59 |
+ struct iscsi_session *session = conn->session;
|
|
|
5ebdd59 |
+ conn_rec_t *conn_rec = &session->nrec.conn[conn->id];
|
|
|
5ebdd59 |
+
|
|
|
5ebdd59 |
if (conn->max_recv_dlength > 65536)
|
|
|
5ebdd59 |
conn->max_recv_dlength = 65536;
|
|
|
5ebdd59 |
|
|
|
5ebdd59 |
@@ -30,5 +33,9 @@ void be2iscsi_create_conn(struct iscsi_c
|
|
|
5ebdd59 |
if (conn->max_xmit_dlength > 65536)
|
|
|
5ebdd59 |
conn->max_xmit_dlength = 65536;
|
|
|
5ebdd59 |
|
|
|
5ebdd59 |
+ if (!conn_rec->iscsi.MaxXmitDataSegmentLength ||
|
|
|
5ebdd59 |
+ conn_rec->iscsi.MaxXmitDataSegmentLength > 65536)
|
|
|
5ebdd59 |
+ conn_rec->iscsi.MaxXmitDataSegmentLength = 65536;
|
|
|
5ebdd59 |
+
|
|
|
5ebdd59 |
conn->session->erl = 0;
|
|
|
5ebdd59 |
}
|
|
|
5ebdd59 |
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/initiator.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/initiator.c
|
|
|
5ebdd59 |
--- open-iscsi-2.0-872-rc1-bnx2i/usr/initiator.c 2010-04-16 14:16:30.000000000 -0500
|
|
|
5ebdd59 |
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/initiator.c 2010-04-16 14:16:41.000000000 -0500
|
|
|
5ebdd59 |
@@ -369,9 +369,10 @@ iscsi_copy_operational_params(iscsi_conn
|
|
|
5ebdd59 |
/* zero indicates to use the target's value */
|
|
|
5ebdd59 |
conn->max_xmit_dlength =
|
|
|
5ebdd59 |
__padding(conn_rec->iscsi.MaxXmitDataSegmentLength);
|
|
|
5ebdd59 |
- if (conn->max_xmit_dlength != 0 &&
|
|
|
5ebdd59 |
- (conn->max_xmit_dlength < ISCSI_MIN_MAX_RECV_SEG_LEN ||
|
|
|
5ebdd59 |
- conn->max_xmit_dlength > ISCSI_MAX_MAX_RECV_SEG_LEN)) {
|
|
|
5ebdd59 |
+ if (conn->max_xmit_dlength == 0)
|
|
|
5ebdd59 |
+ conn->max_xmit_dlength = ISCSI_DEF_MAX_RECV_SEG_LEN;
|
|
|
5ebdd59 |
+ if (conn->max_xmit_dlength < ISCSI_MIN_MAX_RECV_SEG_LEN ||
|
|
|
5ebdd59 |
+ conn->max_xmit_dlength > ISCSI_MAX_MAX_RECV_SEG_LEN) {
|
|
|
5ebdd59 |
log_error("Invalid iscsi.MaxXmitDataSegmentLength. Must be "
|
|
|
5ebdd59 |
"within %u and %u. Setting to %u\n",
|
|
|
5ebdd59 |
ISCSI_MIN_MAX_RECV_SEG_LEN,
|
|
|
5ebdd59 |
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/login.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/login.c
|
|
|
5ebdd59 |
--- open-iscsi-2.0-872-rc1-bnx2i/usr/login.c 2010-04-16 14:16:30.000000000 -0500
|
|
|
5ebdd59 |
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/login.c 2010-04-16 14:16:41.000000000 -0500
|
|
|
5ebdd59 |
@@ -390,9 +390,14 @@ get_op_params_text_keys(iscsi_session_t
|
|
|
5ebdd59 |
if (session->type == ISCSI_SESSION_TYPE_DISCOVERY ||
|
|
|
5ebdd59 |
!session->t->template->rdma) {
|
|
|
5ebdd59 |
int tgt_max_xmit;
|
|
|
5ebdd59 |
+ conn_rec_t *conn_rec = &session->nrec.conn[cid];
|
|
|
5ebdd59 |
|
|
|
5ebdd59 |
tgt_max_xmit = strtoul(value, NULL, 0);
|
|
|
5ebdd59 |
- if (conn->max_xmit_dlength == 0 ||
|
|
|
5ebdd59 |
+ /*
|
|
|
5ebdd59 |
+ * if the rec value is zero it means to use
|
|
|
5ebdd59 |
+ * what the target gave us.
|
|
|
5ebdd59 |
+ */
|
|
|
5ebdd59 |
+ if (!conn_rec->iscsi.MaxXmitDataSegmentLength ||
|
|
|
5ebdd59 |
tgt_max_xmit < conn->max_xmit_dlength)
|
|
|
5ebdd59 |
conn->max_xmit_dlength = tgt_max_xmit;
|
|
|
5ebdd59 |
}
|