Message ID | 1495357860-28280-7-git-send-email-Yuval.Mintz@cavium.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wVwz938CPz9s78 for <patchwork-incoming@ozlabs.org>; Sun, 21 May 2017 19:12:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="aOTn4xKn"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845AbdEUJMC (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Sun, 21 May 2017 05:12:02 -0400 Received: from mail-by2nam01on0071.outbound.protection.outlook.com ([104.47.34.71]:54816 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752637AbdEUJLy (ORCPT <rfc822;netdev@vger.kernel.org>); Sun, 21 May 2017 05:11:54 -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=eGViooAqyfwbt2Bxvj981+NnMb7kqO+ZWN+dumk5l5E=; b=aOTn4xKn9ccDcFNgENn9X7Rj9n+//cU9ZLnG0vzGKaC3WyafA+I2gsrTA6ycwIK2/mMWNnYM/IJWX95ovEaeOosj9+Zb9Cl0v8Y93w4CHA4doiufNVmaisF4rKeFNot+wqeVJ1AIviGxWUUyjnvPQ8A87V2ppo+vg89xfhQ5FHI= Received: from SN1PR0701CA0025.namprd07.prod.outlook.com (2a01:111:e400:5173::35) by CO1PR07MB427.namprd07.prod.outlook.com (2a01:111:e400:103d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Sun, 21 May 2017 09:11:47 +0000 Received: from BN1AFFO11FD032.protection.gbl (2a01:111:f400:7c10::116) by SN1PR0701CA0025.outlook.office365.com (2a01:111:e400:5173::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Sun, 21 May 2017 09:11:46 +0000 Authentication-Results: spf=none (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=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1AFFO11FD032.mail.protection.outlook.com (10.58.52.186) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1075.5 via Frontend Transport; Sun, 21 May 2017 09:11:46 +0000 Received: from localhost.qlogic.org (10.185.6.94) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Sun, 21 May 2017 02:11:44 -0700 From: Yuval Mintz <Yuval.Mintz@cavium.com> To: <davem@davemloft.net>, <netdev@vger.kernel.org> CC: Yuval Mintz <Yuval.Mintz@cavium.com> Subject: [PATCH net-next 06/10] qed: Correct print in iscsi error-flow Date: Sun, 21 May 2017 12:10:57 +0300 Message-ID: <1495357860-28280-7-git-send-email-Yuval.Mintz@cavium.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1495357860-28280-1-git-send-email-Yuval.Mintz@cavium.com> References: <1495357860-28280-1-git-send-email-Yuval.Mintz@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)(6009001)(39400400002)(39850400002)(39840400002)(39450400003)(39410400002)(2980300002)(428002)(199003)(189002)(9170700003)(101416001)(189998001)(356003)(76176999)(2906002)(4326008)(50986999)(478600001)(47776003)(72206003)(50466002)(104016004)(76506005)(86362001)(5003940100001)(2950100002)(5660300001)(53416004)(106466001)(77096006)(36756003)(8676002)(48376002)(105586002)(50226002)(81166006)(38730400002)(107886003)(305945005)(8936002)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO1PR07MB427; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD032; 1:THtNp4450IDn5succ3ltdt6i8UNDQzHbyRn5I5P/nbUxq+wrPGfMy1gST6vjM0bJcJaW7g5pw3McsPZBdIyHfMOdWk1gyt5VaWRGQMG7okuLSfrs1qOdcraoenLArrEFYMUeUaJ+OQZOya2X9A670Sdw2+wy8IfJts8dT2S1w/wB5qBl624pyV2ouAu3bmqwPjzNsgB2YQf+3+zq/Xy1Uy9g2NaHlvTpLysHDRc0uB+ZHwDjgrpJGNvtzpC8JjrU/AVOvfjdjMHFDealX6wgsWwR6r2QhNI47gJSb5gvpCkhPEhzdbW3iJ9LOEjIdu1qvtWVd7IX8EjyvgKZ30PyCrgsM8qtYWS2Xn1hZSn7HmmkeYz/VJ6zsJ6pwaqGcrmyhO+M2vKmWjUaLtq6oWodvWT8X7DCinMbd4YSKosOAsr5cTq2Vkbd5o2UqfpzTp1z2Be2SxnOvC+NKnkOTM3IkUHs5IoiK6l3maHZuiXVrmqYQ+XU8XR6KRVpjC28PV2K4g3Jzal5rwITmv7dmCfeoOoswCr2otYcLI+wRGoi58Y= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c66e66ce-dd7c-49ab-3963-08d4a029683b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:CO1PR07MB427; X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB427; 3:XNSC7U2f0aSF8jDULGrGsiz0tmChvB0tJKLppIp5GK+519GyiA8AqYiFAS7U5v5koZnML1Ayzn8hGs1aKaJ+4tYK6X6v9cDAzBA9C695ts0zrQXdp597n44u6k/pVU/tta3toYByT255HqOqk7+8D7BW5n+FqeXwp+IDsm62nuMwOxUlI2H581m7r8XWniHoy+QssebEQo24FZokxTFJE92lTe5yzPcRjgyDmjqzQbgEeon0rVh8epNS60OUpzTQvYEhilELpThLprFDaKRbiShc+FzQJfu7CSfKbN6Ma+/L/tW3exPQH2J6yX/1XEuxqrx9PXBCeEAk0eH8g9MvxXYv4ZM+MNdggw8it95Y2ZPfiOrLsHDUAxgzojYHhZTgQc+vpaNJ+T9KxIi/VsJmPAabsNsTEHTGZqBbR2+oZOFaNiRbH/7gFlMVTftIX/9Vy0s3FGgGoRqG0+U3m5+WdaRyUTFUU2qFd6GH6j/PwGe+iSYdYfruh2LgvuquFncR X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB427; 25:e6DaXXVzIICueAtKwVUE0qsoBpgwHJaTF3OgNQvzz3NcX+o126E9drSBo1m2+qDninXSyXBXDq+ZCS7+D6qTB3SLluTa1ydjvILXhfGsNiyKCgpbRwt8JMjG1MObw1YRHl5SMm0Qu7rdyhZOzmfVMAuon3xETXYDp1OdOY/JoV8g5+ek6jQm6QMh6DCBB7DxP6xKKkeSgL1ePk3QFDEBQsKvTZODyNYHvkC05Qz8K4jgF2zF5Om5fXvqhJqxzX65Khj10XQr3G0nzPZ+J+zsZBl3rJTGRUY0DFDgEgDCzEFIs2TX2gBrz5jg4FkgToN00TEnTBLxU7TqHs4udA40AGTz4wPRYnHmbGZ3j/lhmzKy7gRMrkNIeg/NBKDy92Xt82Xx21OysnCj7SvwVQiRwc4nqvhiO7RwyGMkUEBbl4wrt7ihTMSf/NMlx5dGne2HFaZ77UqgLKzYvsz4USKycOevFxN1wTQbZ3DFoe5StCk=; 31:sP9fVFZuCHEFrNjX8WmKQvz1kD1ubns6zLAIBAenpCvqMsy9cchE8gNX9iMwuSy3G0pbVOOmB5mPG7P9N9sGQt14sgKND6q4zu0IDTu/Zxf6lQeZzine9ckFxSTaeaawux1TaOrYqhJKZlGqr6QYablCBIXs2dNj/KlxmamtK/VsUugjuYJjnAEVbvfsjU8Uy+bAFyy40QpWB0ZFXK79DBuLNs5fqd3kbuRjwvyypoHejYD34JMkrTS5QatSo1ZKU9U3QVy5AWY081afmsRvUQ== X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB427; 20:ILdFCxxzIwdAJyHWInoO7SxbmUbuaVvWM4oyBONHj4nrlWcyKsHK7k1pdvHuEqpsv7CIsm9SLKIV5uOsplKzkeM6hz1Icw9WhKP7Ks9Qw1aw9cVzax9XiBKWgO51e6Z7kNLBA9wW09cqooaBzQHxLdMhl/nzhvCda9dGjcB9PA8V52q824wYEqIG1IR7zpZwfIIxcVWngdWwAPoMzvWGCQcKZs7RVIF9NA9Euo5UH6o7ubrp2PFOfyamfnN7XlFHK5RxVOXawnMwuk6JjVghKMGwICmMNCpZ40TF7ipdlg0NEkjBw6z5xZrqN7K/BTsrDa3zyzReaCt+A6gahnBX5YVPKUJFH/gAQpeU+sby0lexM9oSzQhI7tHsnR+Jm/CqiyEvg2j2up6vSxLuW+UFzaBuT8F2g1dsKoCCW5H3WUM1Kz0mjfViU4Z2+E5JaNgXLZqn7yUovNeF9gSy4HYirg7Ax2R5dbPiRp/fzm9bp+ytAnIHzWaV5vjL6nIasau+ X-Microsoft-Antispam-PRVS: <CO1PR07MB4278FC45DBBB6953B4716F08DFB0@CO1PR07MB427.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13024025)(13023025)(8121501046)(13018025)(5005006)(13017025)(13015025)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123562025)(6072148); SRVR:CO1PR07MB427; BCL:0; PCL:0; RULEID:; SRVR:CO1PR07MB427; X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB427; 4:uAsEcR94X+azS5sYU/nzaaDFYA2S/ngV2uvG56HrNS3n55Eg4LbSbx89G6+4TiLHCoReccc652r0zT/CnL+Rk7dV8BZIWBJJs5eC029xFFbL473qfi7101KHDlpXQuxkl4h2LyRVVy4IS0R0GVMLdk9vT8cbzzcTnF3nE8gjoDTfdrzrqbixcENw4xGTeDuY+JudvoNw15fCUbzXMo4fkDnAjHanmQClgix643fxLlUQvEUYmTtg7B9VemyUCQYLQKBtI6QZ+7llMaXouYxcVaHuwCMgp9FoLvk+7yJlV5ZaK/PpQVRMq4dqR8CNu/tc9i+P1L+0anTgITZ1clohLsiI4u1Bxm0MteIQdl6PoAXmWBzK+ApgiBDpmWTj0Z7Q6hAzSxUjHkk6dtq9hjJjzTJEPb3BMmQKz8BOsEWerUBMGk/EQmP4RR8pwdHANSItAUQawYcDWNnSAHbENO8Nzr4PlxYmtywI8tAKEMhzc6XnaVwbEzW8VLWJ9+AriT6Fa915BaMN4871PN59SeJiMe3Ma2470yJ0D/78yB/7WJA4bPvmrCrOWMPL/Ba+D+fWM8lxIU/wk1pwJ45nSLMOLrbl0GS6SBhYZzpjn2rGZa7F+WW7q0OBs3QETCc6N+c9vRhTfO3leIhbqP1glEb9CbyPu41DXpbwh6zVxWYd3d3SMEDSX6dtsQOJgYZJR+0/IjW0vU8uW5WvbHZJvn0snU4EoHr54VexzSYq+9dtUcmsZqEA6sJp3y/MdbqQhQUmowWXLb9Omosn+xF6uQQFZy3x+tJ5VziVRiCo6yW1K7zcFz0xG0+lDWFMvQaR8x1wy/7sIdIfMTP9rVztGIUU/HytYqGOsafZbFZsWgtHfG0x2rLk2CgQsXTEY/JJ/Juk X-Forefront-PRVS: 03142412E2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR07MB427; 23:5c3Xn0aR+tDw26SiOkLfztDx+Iq9fxMv9Uep4za2y8?= =?us-ascii?Q?Po+uiWuhKehszhdr4+VkmVM1ZazFnbCnxQwknbH6gcYyRsgv87cKIY3evkI7?= =?us-ascii?Q?sV/PGInGJNkjp+1qPvixCezPL5lAaGI4xfq7w4lheIDRPrDQc5Ng5JTxs1Xx?= =?us-ascii?Q?4ijbJ+YYP2VFwBIIVQVt2HpaM4uwCQbw+jsn/2BBRVeaXaQTmRVqZ/rMjP2g?= =?us-ascii?Q?Br2U4jx09p/ylUKzb60yQS/7qewY7PbDftABPef7TbXiOZm4vvmpOneH/Qxx?= =?us-ascii?Q?w4S4gPF+RwVf3WB9G6oX7MLfQ6peAeWQXkvYulqCNC1Nm3L8W/Hg3aWv6lpz?= =?us-ascii?Q?8/H3hd1RNQMeBJ9RasJCQHUVo8ypUWrWzc+Ntzn65PnfZdk9vdjmkauXasoa?= =?us-ascii?Q?Cpt4s/jsbD1StBqRW3whdlJgOdX6HdPKX9NTFc0IZYGlOSk3xZVdBD83c/tO?= =?us-ascii?Q?6mm+n7yjIf3qsgrO0IiGaM6bWWN5QAz8Rzg5tJejEPoIjQ4VVGEKvkT0UCTi?= =?us-ascii?Q?7RgiUz9ZEV0OFwqdHTEboxpVnXbcJvCLsaTaQY7tN9Bnp7nTRMxNRF6m+nd+?= =?us-ascii?Q?isODHIjx3bobk4ECeceILBVetThNeD6jAxTQbfrHVhRWpztlSuoX3ka0DrKg?= =?us-ascii?Q?HGoSzw9k8Nep0dXCvhRAls2IJEcphI1bMsDcnyLYys3LPyLVucbrq0afujVb?= =?us-ascii?Q?4Jnfx/stWNDskZkRibLNYbHeZlVSEsEOiFM17WsTqMQ1QQsHmIzIZgqHaFqO?= =?us-ascii?Q?UKBTT9veaXurkzne8gLPXFhvzZDuWqXcwEeSp5mIrLFwJ5uWia3ASRDak4z8?= =?us-ascii?Q?P7+FzwfB55JBJ2AVoRE1jH2fctXko8ZK3WO8BmOEWu6uM23NQUSJcMVLHYa9?= =?us-ascii?Q?k5LtAoLZMF2TEIkt2zBNV8vmB3piseZYhW9KuFFPwRjG9Cg+Df8Qe35uOZZg?= =?us-ascii?Q?0juPRRYGHjyKLFamdlxRkFwycJrDtzvmX77uJ1X/B3oor1P06rBeLyeo3AH9?= =?us-ascii?Q?kjtd/N+hhRLb53AYuHtJC/P3i+m59Nb66Wt17jOSg2whNeLkqJAmWBe3kbwu?= =?us-ascii?Q?B/5mk/YS8JXAQpKZSwaItqRFny?= X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB427; 6:oesVSXvtnexzuZaO/uklU7HXtKwP5pZ6Xpq//CLsBQ4uPSwhtQKSqM2AgSAXxIVfKC3f++3XX3J3cIODktQKJyo9ufEY3vWocb9wYpb9wHwK5zYMgVkG5m1e89maSH/5cMNk242OhDaQinpUdQd5HoYcqzacsG/uaK4ifMxMoihdXE8QNyPv5iJf2ZL1Topx8QZJp2Zg+iA6JQL8dMOq+O3HtkM51+ls1bLpDk2MSPVvejIIVtHShMQzkK9ME7QtVfWBC0nYQoo66y25++BqGuNcuyUWH5ybQHjtazA9tQLVdwIDi5xry8XEWSl0kR0xV/e2NVFG9Ch7BSrEfmkGsH/OfzAichQ8KUpdbQ/p5KDgqR0UCsfrKRE9h5kTkUaU2Q6ZuYTVI/gnXyWgSmLBaXf2L9+5EVQ20kP6C+Ok+tWVCZDz320kjuhkAEuR+da+C5MSrp/V2dJwjKPEuuIsIg8XwbLBK+4B7yfjZJLQZDJDxujzVXXJ/YzH0PzTD/VohH+4P7qmPrJywp1s0LEzQQ==; 5:nbuTX5qo/nhCjiLz2QY+WHyqWPrxE4CGYtEThpNAyavcK+uBEl+ZjD3+c+SlSIPeCyVKxiu71NrNvAGe+IdGZuHEoSS5m7yq6e0Vwz3t0u7tONa1QIG6NKpSDoBv641DHePo3pLio3VljR/PIc8Lnw==; 24:G+LV/W/SDS9kcfL2JVlU6rVskn4U0kmRoscElKzsH3Ite1u8KPcPciW97rR1L4qCqdGGwoDNaRQCwrYHtqYNs5OoMC4NbOdlJyREALBxfjg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR07MB427; 7:hM4ULddxEaXuTw7Uuy8wBuqDJi/WtsgyTs4vTRN96dYF3wvhfX5OghvxM9dEHDeZZ7GYZHWIhqA/bQ6JKJhDBYexTiIOkho9tUipztbSRt5QSZY+mxZfsTj1iKBDmiuCTNMb1BO6il/hpPdUUvnqGh0ek08szDn1MPrEPAMKzyH4RgxoURcpnkz9dlLPT45dbn33QUlQcxdC0BsFkKr1u9eMeDcNNjJ/dI0F0y+gWeqyDnK9oTkc5h5NGOnwk/sMIIXasoaOrMvIrPwoM7jYL/GvGi9dDC2ENP7juL8Jmr6sgq1uZIYWOoaNPOZoPo3gcFUHQJVppAQNknceq3isgQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2017 09:11:46.5309 (UTC) 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: CO1PR07MB427 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/qlogic/qed/qed_iscsi.c b/drivers/net/ethernet/qlogic/qed/qed_iscsi.c index ac3c692..38488db 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iscsi.c +++ b/drivers/net/ethernet/qlogic/qed/qed_iscsi.c @@ -186,7 +186,7 @@ struct qed_iscsi_conn { DP_ERR(p_hwfn, "Cannot satisfy CQ amount. Queues requested %d, CQs available %d. Aborting function start\n", p_params->num_queues, - p_hwfn->hw_info.resc_num[QED_ISCSI_CQ]); + p_hwfn->hw_info.feat_num[QED_ISCSI_CQ]); return -EINVAL; }
If too many CQs are requested, qed would print the available number as if it's a resource and not a feature leading to the wrong print. Fixes: 08737a3fa30a ("qed: Inform qedi the number of possible CQs") Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> --- drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)