diff options
| author | Joe Eykholt <jeykholt@cisco.com> | 2009-08-25 14:02:17 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2009-09-10 12:07:49 -0500 |
| commit | c356afd48690775097507c37780ee17c0b0ea375 (patch) | |
| tree | 6b4839881ff5597525a0dfa4f8e08adfb1cf64e7 /drivers/scsi | |
| parent | 0f6c6149870e03c722af6eae406758b28cb71320 (diff) | |
| download | linux-3.10-c356afd48690775097507c37780ee17c0b0ea375.tar.gz linux-3.10-c356afd48690775097507c37780ee17c0b0ea375.tar.bz2 linux-3.10-c356afd48690775097507c37780ee17c0b0ea375.zip | |
[SCSI] libfc: discovery restart sequence error fix
When an RSCN is received during fabric discovery, it restarts.
After the restart, disc->seq_count was incremented, so when
the first frame was received, it was considered "out of sequence".
That left the state disc->active, preventing further discoveries.
Change to advance the sequence count before parsing, so that it
won't be changed after a potential restart.
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/libfc/fc_disc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index ddf494424ff..fd3a6b287e9 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c @@ -629,11 +629,10 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, seq_cnt, disc->seq_count, fr_sof(fp), fr_eof(fp)); } if (buf) { + disc->seq_count++; error = fc_disc_gpn_ft_parse(disc, buf, len); if (error) fc_disc_error(disc, fp); - else - disc->seq_count++; } fc_frame_free(fp); |