diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
| commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
| tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /include/scsi/libfc.h | |
| parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'include/scsi/libfc.h')
| -rw-r--r-- | include/scsi/libfc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 45f9cc642c46..ebdd9f4cf070 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h | |||
| @@ -679,6 +679,7 @@ struct fc_lport { | |||
| 679 | unsigned int e_d_tov; | 679 | unsigned int e_d_tov; |
| 680 | unsigned int r_a_tov; | 680 | unsigned int r_a_tov; |
| 681 | u8 max_retry_count; | 681 | u8 max_retry_count; |
| 682 | u8 max_rport_retry_count; | ||
| 682 | u16 link_speed; | 683 | u16 link_speed; |
| 683 | u16 link_supported_speeds; | 684 | u16 link_supported_speeds; |
| 684 | u16 lro_xid; /* max xid for fcoe lro */ | 685 | u16 lro_xid; /* max xid for fcoe lro */ |