Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195563
b: refs/heads/master
c: a104c84
h: refs/heads/master
i:
  195561: fe80092
  195559: 86f4cd9
v: v3
  • Loading branch information
Vasu Dev authored and James Bottomley committed Apr 11, 2010
1 parent ede8eb9 commit f96f696
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc3593d3882ffa7dfaa739a8302b256955be7d99
refs/heads/master: a104c844576c6bdc44c6f1336e30a5fcd90fef1c
19 changes: 5 additions & 14 deletions trunk/drivers/scsi/libfc/fc_exch.c
Original file line number Diff line number Diff line change
Expand Up @@ -920,12 +920,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
* Find or create the sequence.
*/
if (fc_sof_is_init(fr_sof(fp))) {
sp = fc_seq_start_next(&ep->seq);
if (!sp) {
reject = FC_RJT_SEQ_XS; /* exchange shortage */
goto rel;
}
sp->id = fh->fh_seq_id;
sp = &ep->seq;
sp->ssb_stat |= SSB_ST_RESP;
} else {
sp = &ep->seq;
Expand Down Expand Up @@ -1336,17 +1331,14 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
goto rel;
}
sof = fr_sof(fp);
if (fc_sof_is_init(sof)) {
sp = fc_seq_start_next(&ep->seq);
sp->id = fh->fh_seq_id;
sp = &ep->seq;
if (fc_sof_is_init(sof))
sp->ssb_stat |= SSB_ST_RESP;
} else {
sp = &ep->seq;
if (sp->id != fh->fh_seq_id) {
else if (sp->id != fh->fh_seq_id) {
atomic_inc(&mp->stats.seq_not_found);
goto rel;
}
}

f_ctl = ntoh24(fh->fh_f_ctl);
fr_seq(fp) = sp;
if (f_ctl & FC_FC_SEQ_INIT)
Expand Down Expand Up @@ -1763,7 +1755,6 @@ static void fc_exch_els_rec(struct fc_seq *sp, struct fc_frame *rfp)
fc_exch_done(sp);
goto out;
}
sp = fc_seq_start_next(sp);
acc = fc_frame_payload_get(fp, sizeof(*acc));
memset(acc, 0, sizeof(*acc));
acc->reca_cmd = ELS_LS_ACC;
Expand Down

0 comments on commit f96f696

Please sign in to comment.