diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
commit | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (patch) | |
tree | c2db1b4958bbf617a25398b7ef93d82006b26a17 /drivers/scsi/iscsi_tcp.c | |
parent | 292d4ed32e35df4755052b5002e533348d1648fd (diff) | |
parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) |
Merge branch 'master' of /usr/src/ntfs-2.6/
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; |