diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-09-15 23:52:28 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-08 00:09:33 +0200 |
| commit | 485868208ee833628d49f81b4609001749d92d56 (patch) | |
| tree | dcbb01362c2fbf0436e494395c24a09e075cd496 /drivers | |
| parent | [SCSI] qla4xxx: fix build on PPC (diff) | |
| download | linux-485868208ee833628d49f81b4609001749d92d56.tar.xz linux-485868208ee833628d49f81b4609001749d92d56.zip | |
[SCSI] fnic: prep for fc host dev loss tmo support
This removes the driver's get_host_def_dev_loss_tmo
callback and just has the driver set the dev loss
using the fc class fc_host_dev_loss_tmo macro like is
done for other fc params.
This also adds a set rport dev loss function so the
fc class host dev loss tmp sysfs support being added
in the fc class patch can update rports.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/fnic/fnic_main.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index df91a61591b2..bb63f1a1f808 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -110,12 +110,12 @@ static struct scsi_host_template fnic_host_template = { }; static void -fnic_get_host_def_loss_tmo(struct Scsi_Host *shost) +fnic_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout) { - struct fc_lport *lp = shost_priv(shost); - struct fnic *fnic = lport_priv(lp); - - fc_host_def_dev_loss_tmo(shost) = fnic->config.port_down_timeout / 1000; + if (timeout) + rport->dev_loss_tmo = timeout; + else + rport->dev_loss_tmo = 1; } static void fnic_get_host_speed(struct Scsi_Host *shost); @@ -145,9 +145,9 @@ static struct fc_function_template fnic_fc_functions = { .show_starget_port_name = 1, .show_starget_port_id = 1, .show_rport_dev_loss_tmo = 1, + .set_rport_dev_loss_tmo = fnic_set_rport_dev_loss_tmo, .issue_fc_host_lip = fnic_reset, .get_fc_host_stats = fnic_get_stats, - .get_host_def_dev_loss_tmo = fnic_get_host_def_loss_tmo, .dd_fcrport_size = sizeof(struct fc_rport_libfc_priv), .terminate_rport_io = fnic_terminate_rport_io, .bsg_request = fc_lport_bsg_request, @@ -712,6 +712,7 @@ static int __devinit fnic_probe(struct pci_dev *pdev, goto err_out_free_exch_mgr; } fc_host_maxframe_size(lp->host) = lp->mfs; + fc_host_dev_loss_tmo(lp->host) = fnic->config.port_down_timeout / 1000; sprintf(fc_host_symbolic_name(lp->host), DRV_NAME " v" DRV_VERSION " over %s", fnic->name); |