From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF801C282CE for ; Mon, 11 Feb 2019 14:22:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E795222A1 for ; Mon, 11 Feb 2019 14:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549894975; bh=fQmhBZQkgFnXW1rdCVaL/A5fZ0NHGqMye8gBu6bAuEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hvOgSXiqNAG7cHds6bP2RBU8Id+5YDtKdie45ZYJWttPmsCcYzJrsUPtP19lzovP6 LsEDdMYrKeLRXyoR2s9p1vnAKyn16GMkTZESZ/sS8HJg1txrZtfMGhk5U4Mv2ij/5Q Jy59phiqAqKHfec6ACJr7M8cuBiokb06MH9qYH+M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728885AbfBKOWy (ORCPT ); Mon, 11 Feb 2019 09:22:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:55844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728875AbfBKOWw (ORCPT ); Mon, 11 Feb 2019 09:22:52 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE8DB20844; Mon, 11 Feb 2019 14:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549894971; bh=fQmhBZQkgFnXW1rdCVaL/A5fZ0NHGqMye8gBu6bAuEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ckZd4WEioCJzlK8ILPbQpQdG8fwfjjf0cSnOL7A8tMBwUVrQe3rXvBwO2edgFzR96 /KQPCbxicQkNdc6xtK8qYjJuEo/NJEGktL2N3dEYkm3CyubQojWp4I33RPf0CjwWTQ 0DzzqSv4gbht5sKe+fe0boKH2MXufHD0ZnISoyHA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dick Kennedy , James Smart , Hannes Reinecke , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.20 019/352] scsi: lpfc: Correct LCB RJT handling Date: Mon, 11 Feb 2019 15:14:06 +0100 Message-Id: <20190211141847.595142172@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit b114d9009d386276bfc3352289fc235781ae3353 ] When LCB's are rejected, if beaconing was already in progress, the Reason Code Explanation was not being set. Should have been set to command in progress. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Hannes Reinecke Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_els.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index f1c1faa74b46..96e2f542734a 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -5701,6 +5701,9 @@ error: stat = (struct ls_rjt *)(pcmd + sizeof(uint32_t)); stat->un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; + if (shdr_add_status == ADD_STATUS_OPERATION_ALREADY_ACTIVE) + stat->un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS; + elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitLSRJT++; rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0); -- 2.19.1