diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /drivers/scsi/iscsi_tcp.c | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 4fea3e4edaa7..3d8009f55342 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
| @@ -3368,7 +3368,7 @@ iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param, | |||
| 3368 | switch(param) { | 3368 | switch(param) { |
| 3369 | case ISCSI_PARAM_MAX_RECV_DLENGTH: { | 3369 | case ISCSI_PARAM_MAX_RECV_DLENGTH: { |
| 3370 | char *saveptr = conn->data; | 3370 | char *saveptr = conn->data; |
| 3371 | int flags = GFP_KERNEL; | 3371 | gfp_t flags = GFP_KERNEL; |
| 3372 | 3372 | ||
| 3373 | if (conn->data_size >= value) { | 3373 | if (conn->data_size >= value) { |
| 3374 | conn->max_recv_dlength = value; | 3374 | conn->max_recv_dlength = value; |