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/bfa_fcpim_priv.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/bfa_fcpim_priv.h')
| -rw-r--r-- | drivers/scsi/bfa/bfa_fcpim_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/bfa/bfa_fcpim_priv.h b/drivers/scsi/bfa/bfa_fcpim_priv.h index 153206cfb37a..5cf418460f75 100644 --- a/drivers/scsi/bfa/bfa_fcpim_priv.h +++ b/drivers/scsi/bfa/bfa_fcpim_priv.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define BFA_FCPIM_PATHTOV_MAX (90 * 1000) /* in millisecs */ | 35 | #define BFA_FCPIM_PATHTOV_MAX (90 * 1000) /* in millisecs */ |
| 36 | 36 | ||
| 37 | #define bfa_fcpim_stats(__fcpim, __stats) \ | 37 | #define bfa_fcpim_stats(__fcpim, __stats) \ |
| 38 | (__fcpim)->stats.__stats ++ | 38 | ((__fcpim)->stats.__stats++) |
| 39 | 39 | ||
| 40 | struct bfa_fcpim_mod_s { | 40 | struct bfa_fcpim_mod_s { |
| 41 | struct bfa_s *bfa; | 41 | struct bfa_s *bfa; |
| @@ -143,7 +143,7 @@ struct bfa_itnim_s { | |||
| 143 | struct bfa_itnim_hal_stats_s stats; | 143 | struct bfa_itnim_hal_stats_s stats; |
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | #define bfa_itnim_is_online(_itnim) (_itnim)->is_online | 146 | #define bfa_itnim_is_online(_itnim) ((_itnim)->is_online) |
| 147 | #define BFA_FCPIM_MOD(_hal) (&(_hal)->modules.fcpim_mod) | 147 | #define BFA_FCPIM_MOD(_hal) (&(_hal)->modules.fcpim_mod) |
| 148 | #define BFA_IOIM_FROM_TAG(_fcpim, _iotag) \ | 148 | #define BFA_IOIM_FROM_TAG(_fcpim, _iotag) \ |
| 149 | (&fcpim->ioim_arr[_iotag]) | 149 | (&fcpim->ioim_arr[_iotag]) |