aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/iscsi
diff options
context:
space:
mode:
authorNavdeep Parhar <np@FreeBSD.org>2015-11-24 01:12:17 +0000
committerNavdeep Parhar <np@FreeBSD.org>2015-11-24 01:12:17 +0000
commit7ceec7e48dab4320f83d53de5ffb19f07a3a5f4c (patch)
tree15363ef4b32b0175fa68fe78e343bb6542d3caad /sys/dev/iscsi
parentf5cadbc463fa112465628240e4a0c342e22cbd6c (diff)
downloadsrc-7ceec7e48dab4320f83d53de5ffb19f07a3a5f4c.tar.gz
src-7ceec7e48dab4320f83d53de5ffb19f07a3a5f4c.zip
Do not generate PDUs with payload greater than max_data_segment_length.
It is perhaps preferable to have a separate limit for send instead of reusing the receive limit. I'll discuss with trasz@ and mav@ before pulling this into head.
Notes
Notes: svn path=/projects/cxl_iscsi/; revision=291228
Diffstat (limited to 'sys/dev/iscsi')
-rw-r--r--sys/dev/iscsi/iscsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index 910f6c3470c9..b3b40f11a186 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -1371,7 +1371,8 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
is->is_statsn = handoff->idh_statsn;
is->is_initial_r2t = handoff->idh_initial_r2t;
is->is_immediate_data = handoff->idh_immediate_data;
- is->is_max_data_segment_length = handoff->idh_max_data_segment_length;
+ is->is_max_data_segment_length = min(ic->ic_max_data_segment_length,
+ handoff->idh_max_data_segment_length);
is->is_max_burst_length = handoff->idh_max_burst_length;
is->is_first_burst_length = handoff->idh_first_burst_length;