diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 11:59:37 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 14:20:42 +0200 | 
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /drivers/scsi/bfa/rport_api.c | |
| parent | 6a867a395558a7f882d041783e4cdea6744ca2bf (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
| download | olio-linux-3.10-dbb6be6d5e974c42bbecd183effaa0df69e1dd8b.tar.xz olio-linux-3.10-dbb6be6d5e974c42bbecd183effaa0df69e1dd8b.zip  | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/scsi/bfa/rport_api.c')
| -rw-r--r-- | drivers/scsi/bfa/rport_api.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bfa/rport_api.c b/drivers/scsi/bfa/rport_api.c index 3dae1774181..a441f41d2a6 100644 --- a/drivers/scsi/bfa/rport_api.c +++ b/drivers/scsi/bfa/rport_api.c @@ -102,7 +102,7 @@ bfa_fcs_rport_get_attr(struct bfa_fcs_rport_s *rport,  	rport_attr->qos_attr = qos_attr;  	rport_attr->trl_enforced = BFA_FALSE; -	if (bfa_pport_is_ratelim(port->fcs->bfa)) { +	if (bfa_fcport_is_ratelim(port->fcs->bfa)) {  		if ((rport->rpf.rpsc_speed == BFA_PPORT_SPEED_UNKNOWN) ||  			(rport->rpf.rpsc_speed <  			bfa_fcs_port_get_rport_max_speed(port)))  |