Message ID | 20180501160154.27915-3-himanshu.madhani@cavium.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-scsi-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 62ABC60234 for <patchwork-linux-scsi@patchwork.kernel.org>; Tue, 1 May 2018 16:02:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5330328426 for <patchwork-linux-scsi@patchwork.kernel.org>; Tue, 1 May 2018 16:02:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4784528988; Tue, 1 May 2018 16:02:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 908DE28985 for <patchwork-linux-scsi@patchwork.kernel.org>; Tue, 1 May 2018 16:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbeEAQCD (ORCPT <rfc822;patchwork-linux-scsi@patchwork.kernel.org>); Tue, 1 May 2018 12:02:03 -0400 Received: from mail-by2nam03on0051.outbound.protection.outlook.com ([104.47.42.51]:64220 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753851AbeEAQCC (ORCPT <rfc822;linux-scsi@vger.kernel.org>); Tue, 1 May 2018 12:02:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=jLiam/kCaMwKgGnTJtvlpbm4mwt6MR+LQTIrO8LPm6Y=; b=E+cT3O+Yyxl0jSuUeJt1klIk9dJUvEg+wxhstN4n35SLW3ZdrtrNPWkO4e8YCIEB9vrh9UxmUWWxrQzQURCIj2Bd4d7n12Z2GmQ1x9J5OfUz8yZbqiYO+qZhlW9rFKSXY5zT6gAVcscRFr61HcIT4sRANE6x+77LRHuZ0PnSCDE= Received: from SN4PR0701CA0003.namprd07.prod.outlook.com (2603:10b6:803:28::13) by CY1PR07MB1510.namprd07.prod.outlook.com (2a01:111:e400:50ed::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.13; Tue, 1 May 2018 16:01:59 +0000 Received: from BY2FFO11FD017.protection.gbl (2a01:111:f400:7c0c::110) by SN4PR0701CA0003.outlook.office365.com (2603:10b6:803:28::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.715.24 via Frontend Transport; Tue, 1 May 2018 16:01:59 +0000 Authentication-Results: spf=pass (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BY2FFO11FD017.mail.protection.outlook.com (10.1.14.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.696.11 via Frontend Transport; Tue, 1 May 2018 16:01:59 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Tue, 1 May 2018 09:01:59 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w41G1tcH027958; Tue, 1 May 2018 09:01:55 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w41G1t0m027957; Tue, 1 May 2018 09:01:55 -0700 From: Himanshu Madhani <himanshu.madhani@cavium.com> To: <James.Bottomley@HansenPartnership.com>, <martin.petersen@oracle.com> CC: <himanshu.madhani@cavium.com>, <linux-scsi@vger.kernel.org> Subject: [PATCH 02/12] qla2xxx: Fix sending ADISC command for login Date: Tue, 1 May 2018 09:01:44 -0700 Message-ID: <20180501160154.27915-3-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180501160154.27915-1-himanshu.madhani@cavium.com> References: <20180501160154.27915-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(39380400002)(376002)(396003)(39860400002)(2980300002)(438002)(199004)(189003)(76176011)(2616005)(126002)(575784001)(446003)(486006)(86362001)(8936002)(4326008)(51416003)(11346002)(6666003)(50466002)(305945005)(336012)(48376002)(5660300001)(26005)(476003)(50226002)(106002)(69596002)(80596001)(186003)(356003)(2906002)(42186006)(8676002)(16586007)(316002)(106466001)(478600001)(54906003)(72206003)(1076002)(36756003)(110136005)(44832011)(87636003)(81166006)(81156014)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB1510; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Pass; LANG:en; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD017; 1:9mks9xzp3jf7efpFzy2N00QXZtPmgZ629aq34bWzBoTckbUakm6VBEM7V9z9msSXBA/z3SMoDYByth7QEncHA/eRYzHLB44bFkDh6bkQ1yK5HD0jAR2DeumpBHuwdrvn X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:CY1PR07MB1510; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1510; 3:oy4kr8/AphDcnRivHPln1+LeOqramK4NMZlKiNBqA1XM5Ii6w2dUiVnQzhRMAuY1Gxnek8snP4mXeCj3KMSCNplGzzcLifdKYtNGP6UYypBmZ/pZxR7ANlSyiCdw6kXttEWQtHNa38gLpvAVB5447uWY9sZ79Jd9y9IhrtvbjP0JpGrGGvYycN9cOUWJ7OiH1tm0LUALJQhyKVDAMaKPFW5M+WnX88NUm5/fA/0/myMeTy8xnFLUxmhnRK4dQJ51+FNETGBEcuJakGLY8m297oh8RHlgAHlf1jeEnbd5X5jEWBG09PHxqnt2/wEgEdu9XX0MthbZ3+pdbSgHI/1d3g==; 25:BVZeEiDK1NPEivG3kcIjyoZsKmpxzjzENBXrRdR3r5BfAgd2B9eeIhsXQbgoSbI6+CO3G57sawHkSKJ8ySF0Xb1hbsoAm2zsUugOTYTluFvSFc1huzuclEdcuWfzkFGgDiBswSHZ+3k6lAJrre1spmpJYau6c5VLWjrzWhknU+T/v5XOxoD1GnmrMf9HiD3Yg5W0WPrLAYvLpdBcjCMyP3H5LjnZ86mnE6eROPfQZNer2XnXrLXkY/BnwmGln2tpFho8K5hkOLf6CcSfZaabsTy3TIeWfyYptsUmqbuEI3eR10uKwuKQwxBQHm4w191wgRcNROlqyO4EjUjPUXm9GQ==; 31:8R2/+ZzdubMWlke6HDVniRInKvZ1XevCJnA8KrkW7L0wdTJjnAIPjEgwQfVFpqh5GeFtGoJYnm/bYmt83zd4GowisXxmeXSxvRrx4De1l7zO0woMW9N13n4JUV06rJJwPkVSDUjeZSVgQnmwXVnz+sOQ7ACh3HbUxqw3HSd4H05UFE1G6219bjHBCcaF8/tVmXE6nDEtxMW2g9rnYwpSYEgjXiGaT+ZZ8wRXEzzQC5Y= X-MS-TrafficTypeDiagnostic: CY1PR07MB1510: X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1510; 20:8a5y8gHHY3wNI6mLXwypc9+cBYZyFH92uoTvC+MOJECXQxmsuZp7TNOL8oOMU6+ySSW82WqPvncuZqaZycNsbfm010IzRgXAkE4T5RSqM5ElSMqEDNt7jw7eWg+x05nXpho0k3edXCYtXnnUOqml5L7oBF6WYLacbMUpvAPxMzmNpf/KgCNnQzcI+LpWEF8ZJlTSGBnOrfLzT/nPQmADNaJSyN1d5/ZGVOf3kolV2XNlVuUQasfgGJ1OJ41dVFjIOEJ89xyV6cc29/+eLBUkEzQPdF8bcWVYPR3hJfSxVa9SjVAqjH5UIdkGsyrETPqytAGVClaYsfBtDOloeixcHzAzi0yaHVjP8NwmbIneiE1WxuTEijYFXi15NehKvk+F67VvKPhZnUTQ+WyOlgrgaoSKF1BHtgLyOqrZtnIFdcj2c301LgB8r/NU90gxPL4jJWHF7S02hxJR1Fdmnl9TvgnOOp3USuafQT5+tW4uC/0iLJ1XvODGDL42kTIHdERU; 4:qm4FB+zmdkIS2i9XZ5bdmUD9TEmnanwkNpYtY2cayuUs6V6DO9ytSuvGLP8+Gs8CJvtWaHLW4R4inddmXnBrztoWAwHyMy9HUlDXh0IY+g+cMdBMxruW6ANk8GB5/6685Nsm8p0787QEAON7FlJpV+5bELe3d6CO4MvzRhTRvvvwlCOUvtpdOmhEeN6pOl7iXMOR/4hdPxP6d2MRXTQYU5IAT8W/6TLhzYfr9r02XCcX72GOoDhYAQybOo/gCSCgI0LnxKlRuJXVcdcBeIuKwg== X-Microsoft-Antispam-PRVS: <CY1PR07MB1510038A5F32DD545E74384CF5810@CY1PR07MB1510.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(3231254)(944501410)(52105095)(3002001)(10201501046)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:CY1PR07MB1510; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB1510; X-Forefront-PRVS: 06592CCE58 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB1510; 23:T3UF6UtDJeAjfxkK6KnO8+++evJZtqQn8gmyA71z3?= =?us-ascii?Q?YHkC4SmUKmXWymPp5PBPnDZUkWzDi+p+2B0Yr5lZ876Y3PZuXpGrHMU6YByR?= =?us-ascii?Q?kYsJ/PM492sN6uG9gMf6icR+k7eS3huEIehqx0uBKkzSvN0zUDwmKs8yCYa5?= =?us-ascii?Q?umemaIPvzWTIyxGL1JzCyhcISiEW2WdLIswpNL/rUscmGj98vUAVI1kSWdWO?= =?us-ascii?Q?pTp8exoklFUtStq0RNvfWrde7smkFRgRq5TS7XxRduiGlsLJNJF/F17XNC0B?= =?us-ascii?Q?41bY/tI95MgidUw3GZB73T924ob90CLOhfdyLPd9IKf7DM8LIT2FwkO1Cg0D?= =?us-ascii?Q?nMT2lM/JN676Ruzr9874oYCuceCZOP0Qxy+RD2gNdzdeK+FdJx1lM/fQRtNu?= =?us-ascii?Q?pfGvt64szvsGKGwm3iM9ihvKoN0fZ2H3jv92qlhDCqSLwe56YoI6S2WhjdUC?= =?us-ascii?Q?mhUTT4nyQMjp2YV9gXV7h/Dzg3nUlKMv+DVGUUQ1UNjTrtwbbNOs4PGEn4Kp?= =?us-ascii?Q?Vd14WlWa+iqIgr8Jrq26sZju5BENz6L6dDD604z81agotpDHKDsWxiD+FvIb?= =?us-ascii?Q?m13IC+88gP6kwIeUfpIi/YtFrgNYZXcjtO84NmEPgx3XoOk3AHFr+OPX8nsh?= =?us-ascii?Q?3ePxwjHx0pyoctn6R9+iFxUvec1ln3Jgd09G2e41b1WNYrx7wcx1g6qeGwWO?= =?us-ascii?Q?kWEHb2y695TD72GJIw++ysnoCz1d3+OZw7UgvquCaLyqllAjDJnU9f5RWMB5?= =?us-ascii?Q?QkAVzFjStYqTiWyUGrMBHWNXZQvIAGJPzzMTlpSi15UCqsM49EeVfYevI8Nu?= =?us-ascii?Q?QUrW+mxbmHmY3Njyi3mHwef31+2ItNVoeL8bIGfQKbvjvgIELGLeQYJW8FdF?= =?us-ascii?Q?LJA4TH4gaG87PNsB1W6iuvwya5olqbLYGEPjr9IYGFDsIB3pBRN+tddjqL5k?= =?us-ascii?Q?0IG40ut17Abx08qVAsGc2OmSqmhTAQcguDWqg5W0jHKF5qTzyBL2ZWhUolBT?= =?us-ascii?Q?ONpAiMK5tPHuGIdq0dJtf4xqSkF/VAqujE9QVoQxFxRFOXmlZyJFtV4lArnb?= =?us-ascii?Q?gRUw/jqFRLqH/T9HVQhlT31v7VDs++An6mlU0NnqxILdSnh5R3586ZDHghlc?= =?us-ascii?Q?10lfd0DfnkcKdgTBYLQuUB8QWrU5G35?= X-Microsoft-Antispam-Message-Info: Np1+LXqsGwyRtj39wEM4uuYCXfFGNfAlXi07iNVQthJYrcSCJStLu2yof4nygQAjJ/5gxRfQ+wsIJmKRLtYP05nlFmg43igzCgslq2J+MG6roqZlCxSrPNSqMGD+FsdIHV6oolo7xoN9F5Mhvhcb3rLgwSwitUQq3fDlmq0BZT6y3Cajzh0VcqpWtDFLgyUa X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1510; 6:FXR6mrKlyVAjHhMffTtyuttDHXhGG91m3quJwDnQvINg3PyBIGdm2XZI8lUOwOUkehDCf7dFPS6oi+zaHFtiylQOm9cfc4/1U33GyaTB3mEO0JY7aBulcLe0G5rG3ZO2czMvOrqhl1WtQTiIqvnFBo/xuUONyKWHg6YLNApC1cFlgn0H8TKATzl1Jv2U7b3JCXCLAFY/h0vDmnTzGd8StGzzT+sc0CT7ZLKJQSfjtjqK/uDkqGQVZiW2jfmfvIfg1XrZEcRiKcNzE3wbWZWRyB7s+6jc3m7XTiwb37P4tfAa4aIkok62NAEfj42I83q8d5EqqsA6jTgHnE6wIFVJYcLN420OtZq1T9M3+h8GlywvyuqJ9wn8oz6NbH/XD77suOXIPZnPJzZpbHO9B5yZnt6v/Gk3cjgJJRYsYuAIHUZltbxmA0pEjNOEoXQCaoi3LdOpilp8AJ9pjkEuN4VwXA==; 5:gIZ8yayfvWJBT6715XQiRis8WUjvGTcI57jQOtC5UqzBAbjVBkoXBcCcISf1g5Yh2pPDaIm7P8MmU8VwrHWm6SuzhgHfEUUh2TjzXLEPmchE41zfHjlfIfG8OUBjOg8x8tjnYW3nuLs4anpMgaNLud1dmsf3Gn9GD6P/tnvO5Bk=; 24:tQ66wr5AIsjcXvgx5WER5FNqM63PFXb+Xwodr9mryYSYfS++UAHEt5nlDONyHMEFkK81x6/AWY6BnGNtoFA+R88ogZjnq5+z1tG6jqBy/HE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB1510; 7:PP1dtBww7AxtPjezZyKeNCIYrBFd+1BClER341+C5NwffiVJe8Epm2k2MolO96TOeJoJuX8E1ZFFqwsKsd6gCC/muydaIZ4mojgOYfH+pphcHauArxGiIzAK7mG7r2+5uBDKewxUaiMfyCBLtHBRDPTs/x0pnoyH5chnH7gbx0fCJvKaFgw4fBmtGHhY5V69HlIAdfruo1aV09g0fxNM1y76OIrFQtB3TavAwSrHPtB+X6E5fheZ8+d9osmtD0CX X-MS-Office365-Filtering-Correlation-Id: 7943c546-93e5-4f85-214d-08d5af7cdf0a X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2018 16:01:59.3553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7943c546-93e5-4f85-214d-08d5af7cdf0a X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB1510 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: <linux-scsi.vger.kernel.org> X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 8f55dd44adae..b9050cb52c0e 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1167,9 +1167,6 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) fcport->login_gen, fcport->login_retry, fcport->loop_id, fcport->scan_state); - if (fcport->login_retry == 0) - return 0; - if (fcport->scan_state != QLA_FCPORT_FOUND) return 0; @@ -1194,7 +1191,8 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport) return 0; } - fcport->login_retry--; + if (fcport->login_retry > 0) + fcport->login_retry--; switch (fcport->disc_state) { case DSC_DELETED: