From 33e5b9fa59f4b7c91dde078630dd8a5d70576f0f Mon Sep 17 00:00:00 2001 From: James Smart Date: Thu, 1 Mar 2012 22:33:29 -0500 Subject: [PATCH] --- yaml --- r: 298241 b: refs/heads/master c: f09c3acc451670a6f635a45acc6bdf4dc7ef2a4b h: refs/heads/master i: 298239: 4182f2a6e84349dfe49014b8ad3578a6e069bba1 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6455ff54bb80..e626c13b5663 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2db93ce8cc1801ccb32a2f19062d110e5a9d4282 +refs/heads/master: f09c3acc451670a6f635a45acc6bdf4dc7ef2a4b diff --git a/trunk/drivers/scsi/lpfc/lpfc_sli.c b/trunk/drivers/scsi/lpfc/lpfc_sli.c index e0e4d8d18244..6b9415fd9c52 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_sli.c +++ b/trunk/drivers/scsi/lpfc/lpfc_sli.c @@ -14203,15 +14203,14 @@ lpfc_sli4_seq_abort_rsp(struct lpfc_hba *phba, * field and RX_ID from ABTS for RX_ID field. */ bf_set(lpfc_abts_orig, &icmd->un.bls_rsp, LPFC_ABTS_UNSOL_RSP); - bf_set(lpfc_abts_rxid, &icmd->un.bls_rsp, rxid); } else { /* ABTS sent by initiator to CT exchange, construction * of BA_ACC will need to allocate a new XRI as for the - * XRI_TAG and RX_ID fields. + * XRI_TAG field. */ bf_set(lpfc_abts_orig, &icmd->un.bls_rsp, LPFC_ABTS_UNSOL_INT); - bf_set(lpfc_abts_rxid, &icmd->un.bls_rsp, NO_XRI); } + bf_set(lpfc_abts_rxid, &icmd->un.bls_rsp, rxid); bf_set(lpfc_abts_oxid, &icmd->un.bls_rsp, oxid); /* Xmit CT abts response on exchange */