diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /drivers/scsi/iscsi_tcp.c | |
parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
download | talos-op-linux-aaadff81195056c7c14e0d834b3318c624c0fd78.tar.gz talos-op-linux-aaadff81195056c7c14e0d834b3318c624c0fd78.zip |
Merge branch 'master'
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, switch(param) { case ISCSI_PARAM_MAX_RECV_DLENGTH: { char *saveptr = conn->data; - int flags = GFP_KERNEL; + gfp_t flags = GFP_KERNEL; if (conn->data_size >= value) { conn->max_recv_dlength = value; |