diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/scsi/libiscsi_tcp.h | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/scsi/libiscsi_tcp.h')
| -rw-r--r-- | include/scsi/libiscsi_tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h index 9e3182e659db..741ae7ed4394 100644 --- a/include/scsi/libiscsi_tcp.h +++ b/include/scsi/libiscsi_tcp.h | |||
| @@ -80,7 +80,7 @@ struct iscsi_tcp_task { | |||
| 80 | int data_offset; | 80 | int data_offset; |
| 81 | struct iscsi_r2t_info *r2t; /* in progress solict R2T */ | 81 | struct iscsi_r2t_info *r2t; /* in progress solict R2T */ |
| 82 | struct iscsi_pool r2tpool; | 82 | struct iscsi_pool r2tpool; |
| 83 | struct kfifo *r2tqueue; | 83 | struct kfifo r2tqueue; |
| 84 | void *dd_data; | 84 | void *dd_data; |
| 85 | }; | 85 | }; |
| 86 | 86 | ||