From patchwork Mon Mar 14 18:14:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satish Kharat X-Patchwork-Id: 8583441 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DD922C0553 for ; Mon, 14 Mar 2016 18:23:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1654D2025B for ; Mon, 14 Mar 2016 18:23:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0503F20259 for ; Mon, 14 Mar 2016 18:23:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754900AbcCNSX5 (ORCPT ); Mon, 14 Mar 2016 14:23:57 -0400 Received: from rcdn-iport-4.cisco.com ([173.37.86.75]:46432 "EHLO rcdn-iport-4.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753792AbcCNSX4 (ORCPT ); Mon, 14 Mar 2016 14:23:56 -0400 X-Greylist: delayed 568 seconds by postgrey-1.27 at vger.kernel.org; Mon, 14 Mar 2016 14:23:56 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1295; q=dns/txt; s=iport; t=1457979837; x=1459189437; h=from:to:subject:date:message-id:in-reply-to:references; bh=09jr0nfGtjUc5VpP+wdjCs2G9L6WNuMQHfEYRyx7f14=; b=O4bWQkZCe7NfTkQDgpDR3ybTWiRI0+6rQJiMhuLcezs+uESWWDX3uoLM 8n4eDQ8cUqDTCdo17z8PR8uvI+5FQXwSxKvinCnxERhfQJiSuKjiIc2W/ /iNl0RY5NIoFmXVteEdOKM6+H/7Zub63GWx4jcNCSn4189thKNjwyua7G 0=; X-IronPort-AV: E=Sophos;i="5.24,336,1454976000"; d="scan'208";a="82719184" Received: from rcdn-core-3.cisco.com ([173.37.93.154]) by rcdn-iport-4.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Mar 2016 18:14:30 +0000 Received: from satishkh-lnx.cisco.com (satishkh-lnx.cisco.com [171.71.12.158]) by rcdn-core-3.cisco.com (8.14.5/8.14.5) with ESMTP id u2EIER5Q021862; Mon, 14 Mar 2016 18:14:29 GMT From: Satish Kharat To: satishkh@cisco.com, linux-scsi@vger.kernel.org Subject: [PATCH 5/5] Leftshift returned scsi_cmnd error code 16 bits Date: Mon, 14 Mar 2016 11:14:22 -0700 Message-Id: <1457979262-26571-5-git-send-email-satishkh@cisco.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1457979262-26571-1-git-send-email-satishkh@cisco.com> References: <1457979262-26571-1-git-send-email-satishkh@cisco.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The the scsi_cmnd error code is expected to be in the left 16 bits of the result field. Change is to correct this. Signed-off-by: Satish Kharat Reviewed-by: Ewan D. Milne --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_scsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 35264c7..e4e22f1 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.22" +#define DRV_VERSION "1.6.0.24" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 8492143..92a4ca3 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -461,7 +461,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_ FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "returning DID_NO_CONNECT for IO as rport is removed\n"); atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); - sc->result = DID_NO_CONNECT; + sc->result = DID_NO_CONNECT<<16; done(sc); return 0; }