diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:42:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:42:25 -0500 |
| commit | 382f51fe2f2276344d8a21447656778cdf6583b6 (patch) | |
| tree | c2836a2cca4126c9c026ce5aa2fdf9f1c8ccded6 /drivers/scsi/bfa/include/bfi/bfi_rport.h | |
| parent | 701791cc3c8fc6dd83f6ec8af7e2541b4a316606 (diff) | |
| parent | 54987386ee3790f3900de4df2ed4deb0e18dfc9f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (222 commits)
[SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP
[SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
[SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
[SCSI] zfcp: Update FSF error reporting
[SCSI] zfcp: Improve ELS ADISC handling
[SCSI] zfcp: Simplify handling of ct and els requests
[SCSI] zfcp: Remove ZFCP_DID_MASK
[SCSI] zfcp: Move WKA port to zfcp FC code
[SCSI] zfcp: Use common code definitions for FC CT structs
[SCSI] zfcp: Use common code definitions for FC ELS structs
[SCSI] zfcp: Update FCP protocol related code
[SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
[SCSI] zfcp: Assign scheduled work to driver queue
[SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
[SCSI] zfcp: Implement module unloading
[SCSI] zfcp: Merge trace code for fsf requests in one function
[SCSI] zfcp: Access ports and units with container_of in sysfs code
[SCSI] zfcp: Remove suspend callback
[SCSI] zfcp: Remove global config_mutex
[SCSI] zfcp: Replace local reference counting with common kref
...
Diffstat (limited to 'drivers/scsi/bfa/include/bfi/bfi_rport.h')
| -rw-r--r-- | drivers/scsi/bfa/include/bfi/bfi_rport.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/bfa/include/bfi/bfi_rport.h b/drivers/scsi/bfa/include/bfi/bfi_rport.h index 3520f55f09d7..e1cd83b56ec6 100644 --- a/drivers/scsi/bfa/include/bfi/bfi_rport.h +++ b/drivers/scsi/bfa/include/bfi/bfi_rport.h | |||
| @@ -38,10 +38,10 @@ struct bfi_rport_create_req_s { | |||
| 38 | struct bfi_mhdr_s mh; /* common msg header */ | 38 | struct bfi_mhdr_s mh; /* common msg header */ |
| 39 | u16 bfa_handle; /* host rport handle */ | 39 | u16 bfa_handle; /* host rport handle */ |
| 40 | u16 max_frmsz; /* max rcv pdu size */ | 40 | u16 max_frmsz; /* max rcv pdu size */ |
| 41 | u32 pid : 24, /* remote port ID */ | 41 | u32 pid:24, /* remote port ID */ |
| 42 | lp_tag : 8; /* local port tag */ | 42 | lp_tag:8; /* local port tag */ |
| 43 | u32 local_pid : 24, /* local port ID */ | 43 | u32 local_pid:24, /* local port ID */ |
| 44 | cisc : 8; | 44 | cisc:8; |
| 45 | u8 fc_class; /* supported FC classes */ | 45 | u8 fc_class; /* supported FC classes */ |
| 46 | u8 vf_en; /* virtual fabric enable */ | 46 | u8 vf_en; /* virtual fabric enable */ |
| 47 | u16 vf_id; /* virtual fabric ID */ | 47 | u16 vf_id; /* virtual fabric ID */ |