Message ID | 20170421053120.12980-3-sudarsana.kalluru@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 3w8PW73RJgz9s2x for <patchwork-incoming@ozlabs.org>; Fri, 21 Apr 2017 15:32:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="LBgklY3V"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035625AbdDUFcB (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Fri, 21 Apr 2017 01:32:01 -0400 Received: from mail-sn1nam02on0053.outbound.protection.outlook.com ([104.47.36.53]:15360 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1035507AbdDUFb5 (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 21 Apr 2017 01:31:57 -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=B/xkor5IeerW8Ks/zxSZ5Dd6d9NgYa/Yv/elDzBYabo=; b=LBgklY3V5RqMgJDNaiFDHYzJQkUU4lCsbacsbsNKS9IeX/OqbH2tSKwhv4fn9sCjWqWQfsr2LSaTiGpI3BdMow3g/VegSO1QQIACr4enMOaLNsxaPiZv/c/ldljtH0jplnLHvTyELUNBWBnbOWVOi8jCynA6nov5WAQ6ue5q6IU= Received: from MWHPR07CA0009.namprd07.prod.outlook.com (10.172.94.19) by SN2PR07MB2525.namprd07.prod.outlook.com (10.167.14.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Fri, 21 Apr 2017 05:31:54 +0000 Received: from BL2FFO11OLC011.protection.gbl (2a01:111:f400:7c09::196) by MWHPR07CA0009.outlook.office365.com (2603:10b6:300:dc::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Fri, 21 Apr 2017 05:31:53 +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 BL2FFO11OLC011.mail.protection.outlook.com (10.173.160.157) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1019.14 via Frontend Transport; Fri, 21 Apr 2017 05:31:52 +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.309.2; Thu, 20 Apr 2017 22:31:38 -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 v3L5VOLH013025; Thu, 20 Apr 2017 22:31:24 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v3L5VOm4013024; Thu, 20 Apr 2017 22:31:24 -0700 From: Sudarsana Reddy Kalluru <sudarsana.kalluru@cavium.com> To: <davem@davemloft.net> CC: <netdev@vger.kernel.org>, <Yuval.Mintz@cavium.com> Subject: [PATCH net-next 2/5] qed: Separate RoCE DCBx support for V2. Date: Thu, 20 Apr 2017 22:31:17 -0700 Message-ID: <20170421053120.12980-3-sudarsana.kalluru@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170421053120.12980-1-sudarsana.kalluru@cavium.com> References: <20170421053120.12980-1-sudarsana.kalluru@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)(39410400002)(39840400002)(39450400003)(39850400002)(2980300002)(428002)(199003)(189002)(9170700003)(76176999)(38730400002)(54906002)(8936002)(6666003)(2351001)(5003940100001)(110136004)(50986999)(107886003)(189998001)(5660300001)(33646002)(8676002)(36756003)(80596001)(87636002)(4326008)(105586002)(47776003)(101416001)(106466001)(1076002)(50226002)(42186005)(86362001)(48376002)(2906002)(2950100002)(356003)(50466002)(6916009)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR07MB2525; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC011; 1:IPGDfmftAGCInv/LEbFBJ6V2FPcAi+LxTZROkhHJfnOkaFLbDO25u7RZN2GEatrmxhuj4TvTDijWzGbTniKOyPJDr6GaOT6w7JyNFu9MglP5rHX5ds6PAZY74p5OfeO0c2AjK6MooxQx6mlkhHXFyELx/QH1CyTQe8VXiYkAH0VDI4jWlFwtxFgwaTmh6xDqsv3h5FpM8yyrsmCDD2mj9LjTtuFATri5NRc3A5+mKcPY22R5lKGe8SD462Vja8tIpR4q8HQK9qgwk8Q3OIlZfeKUbUgjp4PHqzDQ3yjjPvedw8tKnjDtsv45fgudRXLiKUwvPt/8i1OAifxUGeNXWude1Qvedj+K9MCAsR+30JYA567QIV1t24UYHvu3gp0Ev0UMRSmZ6V++J4GFWg/DYBeTRLg07Z5RYk9WQ+7xVhyy+TM+eLc246sU5/osABhTemH2EdsvOSeRzDZJzh70WMOFiM2lUdCtIsdjrX7NP7CPVuvO1R3ki32p2knr+tdhDIK3Xpm30flHgvn3YOFY1M76PcTo2noZRqyegRrMk0U= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed7659bc-a8ed-4106-bd4a-08d48877b7d6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:SN2PR07MB2525; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2525; 3:wVA2E9jj65l3DqtZB18dGSjZ/sQ39sX6oI4MCRYACnhYqaaREHh5QRRDA0piRMIlu63ZqJw2KgiSY9iTUzugRKAz2VU0vTNhWQ9lX6yZKa1siJwxtesVHb789Y67DbT+SujZ52BP7LMSFURGpAbt9w+Gs76ouDCEId/PH75OcF9akxIlzJYJkX5W4Sq7qwtIHPB+9UBT12lvHDTgiF3SHQUbYvzuoLLAU59JxIpBibt0Tz8cItN1AGOt5W+6LEt8Osv9H2ftYrPfWDr73802akcHpGv887nWZ1VdQLclwfdOvxYITRZY4FYMG4wWdZVhCgaHUJdM9ONJrrTt0zmvhcUIocSriO1PcyyBpr+rW3IlbPu1ftw9KFgTDadTcthioaZgQKtmdVyB0r0HZ5gvRrHDwKXIWt5mIBfzo1A6/n9zjPtL8rZpuD16WSxFMew18nlOSCkTEk9W+eag3xZhhRcrPuk9sbidnmN4sWAvsmYR/hMB45FuQItGhMoEPybc X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2525; 25:zBLcBmNfLNnZTCEV1BqypRe0ji3fcv+SWwA15hFMh2+yyAN7zwa0Z4QpGzzdu1bnqy1MUGsZ2cZ207+eJgYN+mqsslBqKL2AHkMKjliR6N7Ki0kM1B23NxGZFhY0CbDpG1B/jgCelJPmEHBvMz+yNV19S9XMsdk47GJdJXYq6nfC1LYAdsP+Af+EWfKx4aecqLw31wHDwdrgZdu+Vi7L3iiOfNxxLoWVu+Zzd+b0dKqedyaCxpMjmZ3LnNVt90WQH8Ui2be2JtHZXR190aTSm/wh7macYNK78qFr0jWlzwKOHkfEbPCnc2GADY5SHR6v/JUzy0MNmDzambGQjNIw7xCt4SYy9gq3n0D7qfiqdvrjAC1kJ6yjKoEnOeZeEnWYJ+Hwsp/zsBAn01jbKxTw7GvFK0yzaCVvD63q1uDBC+x2fbyUxPKNnfWqaq/PvYkcEhCQUlCjdFsdl87lSruxqQ==; 31:ImXQkieq8N/+QFq1n4G06eOaOsnMakLmiwKe8Rhg02vREtmYEQNx3PKTVyo/Ne3HUbc+l68xmR+7CZgJQpiFVljJofjwIJ2Pi3bca22uLJqow7LrID966jogv+THX5f95C9IYp18EMDGZ2M0PX6PHU+FWbaE/kYkVerrhw5JibzIBNlEPr9ZBZg4Dmp1t+ol3OSdQVo4bxaOCMPPv5//0+H704WrR5WsjyTPVZ/iVkcSB7KzVoKym5OGabsPVAyI54M+cwerQaZVMmRPF9do1g== X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2525; 20:+68kJ/PfLXN6tEvnan+gL7WfgwGh/H/fhEYhG2YdMPvdKIcGNCdwP1NcphpJENlM7F6hkOjd0xdirq7bX/7cYAcBCYD5SQ/tSxkaM0zSMVDod7ssVKcOS+ah1jmGLxJ8qUN7f2xrTfPLTMv6UO7N9+eJYTrC61yVAyoVHNrcXTAAa/lL0w/+UmaMJXRNZlTevrpue0ND+enr9tjIyskVEr9hXqoaaaThHkv9g7xQd6c+Ql5HafUWoAEP8627ykZGF80gMhJ/Rxa66xx6g+lM5HTQk1mEIJfV+PcjOSamB5mokBOSgw6DSrafqbl4gr4JxK/uN+eOAeQStmAtYvrl8P26UxiUHAwi5aZWHD/sSqvJ0VmSLBfLWvqxamss8OBBRw/CYfsc/1IZCl6fGhmcR2sEYXpgc9KaR58Je8DokIYjdMSHXvdEKoNNxLaxU44IhkZg/cAO/MkUvJvARteI+bh6LaGiUigwjAZTRfjy5WORPqjMYnZVCYXMBGTqCmZJ X-Microsoft-Antispam-PRVS: <SN2PR07MB2525F48D420FA4F1FA64921A8A1A0@SN2PR07MB2525.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(8121501046)(5005006)(13018025)(13017025)(13024025)(13023025)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:SN2PR07MB2525; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2525; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2525; 4:CDx0Fpd00eMd+CJoS/YX2ZZ3+G2wOfbzN/jXcrPvdbF+cuRv+9lYISTBaqR5aQAHrRyhkFe0o3rY0TwhR1OMC7F+imuwDWtuLh09gfnoI3mlEXiGwDg8kpPU2ACJ3spwshC9edMHC99U6zh7+Cz7Pk8t+KcLGuwoA6NF2BY+aSof51iYrmiPrvL6eKHLIZEWHP+NGexLmKvWrCtjrXxd1vH5/zO5mnJ/nqIzADbAMfp5vabRODtNRjfzhB0DAKRe2Ok3MiXqJ1QRGK0lkGJVaW9zsfKuE/1tJAilV3puS2hdev0peCmFVFRyu8MfnotCo1ZMrcHl1blOnDQuT60swyiZeF8sZLf2EKxx25b2OashyjzRPV6+4oBKDEv3AQA/BpmJay8RCVEa+hmTTNOXFov+FabETEGFjHjRObT+7CERqaYuFjcNZIE7xIm23TT4bXwBGPJDSRnl2hVDxiZoVYioS5V5tNnMRi4ZcfcvmiTzs/8lovrYhrGJFYgLXYotEVJNML96BcFLvVuvp3EjESdx3i1zAV0vHvVy6H+RWGF4fl4Iz/vKwyfwF0wZn4e8VERmqkSTEaLZSqZATWzrfk6gVZwpJK4rIf51iniGlXa13pm3L6Rri/GcyIDwHxbTjik9TtWMU0zgnWKT4IMBgPfceKG5l2+xs0VVg4IJvr82DcNAF/3c6ZKnP6WwYf7ZgWqamtDBh6WZA9w/HVHBpHqs+F8ib7VeEsycIMub2Bws7iq4Yw9Tjeeqx632eT3TR36lFlDl35nYcPPXsjIziTl3LCaVI9G4F06Rm+aSQuP8UDth4blb/oUm7Zil9yvJ X-Forefront-PRVS: 02843AA9E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR07MB2525; 23:cE2KCuXpSvJtFH9IOwv/TEJUaJ4PfYYAD2413gXEm?= =?us-ascii?Q?cFe2WoM9XplCkR6wF0I20akmNOMYLKBw9o2MVvizgZ2omgw+cBHsWe+eUu/G?= =?us-ascii?Q?V3V6ADczNC3iUXhQbgKZPyX+HrLq6db0u4ool58xTeHpzaocZH8ZbqigDQgq?= =?us-ascii?Q?Kicjs6fnAp9gdYijb4EdRw/tV0UPk/cBGSH8oVb9LN7byiJtbXT+A8Hdu2V4?= =?us-ascii?Q?erurlrSbyvSHP2rPjojGA7uKXK1qLRatwyjVSviG7RueTXuQLqhstplflvBT?= =?us-ascii?Q?+Jlbpg8ppONNAjRPyqlooVSK4Gx4vivBVzqKtYsjD7MMnLpZRk68b5iqWiO1?= =?us-ascii?Q?MQCrCegmMJ8AbmnQBuT6J9cVaPfr9B2kHVF4KQRhezZ7SfqG22IsuQPgwP38?= =?us-ascii?Q?xmD+dN1WExFeKtWMcW4nY5tIxHrnDbgVonokJkLneQY7TfZMwv10zLoVOKdq?= =?us-ascii?Q?lt80zg0NWqaabS+x2oNz9yUDHt1ybFbyaG/gmgVBa0bnRKE+EQH3Jo/HdJbS?= =?us-ascii?Q?yDliWDUtG53/0zBUGtpLik8NpZN16Bxm+ZrDQql0ZaHJjzw3ewCIvNPTUu1V?= =?us-ascii?Q?88fFm5un7NQGk/+tog0GDOviVDno8rXkEnJmkZpkGjlEGk9D39WnNUBQfJKT?= =?us-ascii?Q?QimfQdLRUqwgr7liEz9FvmItR7LSEHAtiuao5X1SzA9JdE5xMkQd2SGoDdMP?= =?us-ascii?Q?sOYJq65x5/WcWnse+9wexZrdTIu4ZvZXrbImQEoo4DO28AdpOgegXvVwsYEj?= =?us-ascii?Q?6iqMPbIFYxE/zZUKvR/upPuur5oXbUb52WZTQCBpaES782m78A1cvj8FfIUY?= =?us-ascii?Q?mwoDkWAj3QQ3Jo5IOa/P/8rjSNerjbrIFI35cBhJ0iFZDZcsYKDtphmSbPv0?= =?us-ascii?Q?r/F/B3imsakNORx0onr7pwyRI84GSfdbYloHgFyf61xHCCkUlDgrgdEAPwEr?= =?us-ascii?Q?MW8KLkZpXN1dM5+R6wpUflBYnEW4jYRODXf9CvFv9sCGYKGyMAjBP/oEysu6?= =?us-ascii?Q?dHdj99qWmrRhsJ4gNVKOpFkqpxZclOSEkray706bA8hJ15MVYxRPkXnCntX0?= =?us-ascii?Q?BM62IisZxxZxlE4D/BAxKs7h6IzPwSUbmuY4IT8n5LTKKxBpw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2525; 6:ZVTMrNIbrqeG415VE8X/1nF6GHBjPOUr9qRbugNEP9hlZPvi3YhNCMXlgUmSn0mjmLIK03b0Xt5Jb67mFwXjTu3zrX/gdD3v3Rd7BWtH9gDMPoIaE9L9SKzrhZ/rBpSiX7L3mYJ18dT5IyPPhs7MdBWn3nRJ0sgCp+n6DOyLczzLLnyaCbyQy4OJwwC9M3C6VoUAfAr/KRRD10/DH4AtLZAEOjAZXRBDYru9kaVELYhsrYSzV62iykbyT57l+mm7de6OmHYaGdXOmvtQ6KBAb4b2XtYMJsguV/YkpUaWFoRqldEdVDVlNkm7TR3oHgLEjOtxtoh6DXMUDbtdEk9iAM3zks6GP3D4kAiUiJpCyMXuYY5v6zJIeL8JlrcsuDbUjjBbxONp0uTVPswYFaUwZ4Y+t+b3/u+nckM8HmgVo8AfExZd6Rs40c7FBE8f4g0bGugoIDgWpz0xFB1eczQGzli4qJoy8lnS7MuGdSDx6B/veSnSqWN12f7yr8AEhgYeWLYVgvEshX7ae+ukzBB58w==; 5:TOnz3PNQnZNekD4bRhdP+MkwSnFb/LPizzp/fQLFt67BdCgofQ0wx10auNUcVv1K0nCsmieAtfYkbKsUJ3gmO59SV7T1BOcMVk9yJXr5zpRIbQiFCOpG+0Q0XMWD2Q1nsdTe1kAaS5FN/AFFF52Hkg==; 24:xn71VkaOesnebEu5Ff1R7uf9oBWGNkV8BEDxMPsR+sjPF47Qxq2cQ3SojuyMxQ0DnYpsJPsd+tJ6gjbyyyqCtuPVxYoF/2uWFon2fOwJPGE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2525; 7:vCxBxgth1igs8i2d0aymv5P8mFcaC0Rdva5Fc5ffieu04Ha9OrvEYji55JiYlV9jHl4ezn4gFSVihPFLEXbHPMOGfTX88nffD8ugll+Z4GFVNo5GxG0RKuCZadmsG1Ceui8+6kYYkO2Qf+AkTWirSmVn0ei6ugje5Z+pLzZNs2KIdo+8Urm9S84Q1OlDO87XknuzIfBdn4nzTx7Laqg0ULRJOeFajxuHlGhXALvoZoq9dlS213X8XQgi5lT0kIxwkcfGt6kCOhE/euMycSDIKXtU/+CfBwdgeVwAsuTkKLh7t/rNjOD4Guv5Uc0JcoHCqwGILLzX4bWH6gcTnVIfrQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2017 05:31:52.5072 (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: SN2PR07MB2525 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_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c index 9b4580b..d868b7e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c @@ -944,14 +944,9 @@ void qed_dcbx_set_pf_update_params(struct qed_dcbx_results *p_src, p_dcb_data = &p_dest->fcoe_dcb_data; qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_FCOE); p_dcb_data = &p_dest->roce_dcb_data; - - if (p_src->arr[DCBX_PROTOCOL_ROCE].update) - qed_dcbx_update_protocol_data(p_dcb_data, p_src, - DCBX_PROTOCOL_ROCE); - if (p_src->arr[DCBX_PROTOCOL_ROCE_V2].update) - qed_dcbx_update_protocol_data(p_dcb_data, p_src, - DCBX_PROTOCOL_ROCE_V2); - + qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_ROCE); + p_dcb_data = &p_dest->rroce_dcb_data; + qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_ROCE_V2); p_dcb_data = &p_dest->iscsi_dcb_data; qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_ISCSI); p_dcb_data = &p_dest->eth_dcb_data;