diff options
| author | Joe Eykholt <jeykholt@cisco.com> | 2010-11-30 16:19:46 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-21 12:24:29 -0600 |
| commit | c47036a7cd378533495d8cc06a7cf8a881072a9d (patch) | |
| tree | 6c2cfa3216a04b23c0b0e623827fc39f57db576e /drivers/scsi | |
| parent | 69316ee2e375c5af0cf1f8d2d30f9aa277f0b454 (diff) | |
[SCSI] libfcoe: move some timer code to make it reusable.
Move some of the code in fcoe_ctlr_timer_work() to
fcoe_ctlr_select() so that it can be shared
with another function in a forthcoming patch.
Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/fcoe/libfcoe.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index 26381f00e4e..4d0be20cb73 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c @@ -1391,6 +1391,13 @@ static void fcoe_ctlr_select(struct fcoe_ctlr *fip) best = fcf; } fip->sel_fcf = best; + if (best) { + fip->port_ka_time = jiffies + + msecs_to_jiffies(FIP_VN_KA_PERIOD); + fip->ctlr_ka_time = jiffies + best->fka_period; + if (time_before(fip->ctlr_ka_time, fip->timer.expires)) + mod_timer(&fip->timer, fip->ctlr_ka_time); + } } /** @@ -1449,9 +1456,6 @@ static void fcoe_ctlr_timer_work(struct work_struct *work) fcf = sel; /* the old FCF may have been freed */ fcoe_ctlr_announce(fip); if (sel) { - fip->port_ka_time = jiffies + - msecs_to_jiffies(FIP_VN_KA_PERIOD); - fip->ctlr_ka_time = jiffies + sel->fka_period; if (time_after(next_timer, fip->ctlr_ka_time)) next_timer = fip->ctlr_ka_time; } else |