From patchwork Fri Apr 21 05:31:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudarsana Reddy Kalluru X-Patchwork-Id: 753145 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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 3w8PW53gbnz9s2x for ; Fri, 21 Apr 2017 15:32:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="RIAnfF/4"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035620AbdDUFb7 (ORCPT ); Fri, 21 Apr 2017 01:31:59 -0400 Received: from mail-sn1nam02on0058.outbound.protection.outlook.com ([104.47.36.58]:42496 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1035352AbdDUFb5 (ORCPT ); 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=VQUxhHEHJOxpUZuGpg2f5VrnETQ94MY9RLz/YyywLak=; b=RIAnfF/40sGhhlaaIBb/qz+t0y4jzRUL+LBlHFnyO9HrBHSwbTRk7pRrkcbCKzucKL1hlTgp/SG4rYVOST2sWrHHcakOz1OIaUQiTDBd9fTHf7iN2IMCvMVDf2YP23qh1+rcufyd9ZDYZah0S1r6F+6xwt8GHMq/425A8r9gve0= Received: from MWHPR07CA0009.namprd07.prod.outlook.com (10.172.94.19) by BN3PR07MB2516.namprd07.prod.outlook.com (10.167.4.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Fri, 21 Apr 2017 05:31:49 +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:48 +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:47 +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 v3L5VNKp013021; Thu, 20 Apr 2017 22:31:23 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v3L5VNfH013020; Thu, 20 Apr 2017 22:31:23 -0700 From: Sudarsana Reddy Kalluru To: CC: , Subject: [PATCH net-next 1/5] qed: Cleanup DCBx unnecessary parameters. Date: Thu, 20 Apr 2017 22:31:16 -0700 Message-ID: <20170421053120.12980-2-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 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39840400002)(39850400002)(39410400002)(39400400002)(39450400003)(2980300002)(428002)(199003)(189002)(9170700003)(6666003)(2950100002)(305945005)(87636002)(6916009)(5003940100001)(1076002)(189998001)(54906002)(2906002)(86362001)(50466002)(80596001)(101416001)(106466001)(8936002)(50986999)(5660300001)(107886003)(38730400002)(356003)(48376002)(110136004)(4326008)(36756003)(50226002)(42186005)(76176999)(2351001)(33646002)(105586002)(47776003)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR07MB2516; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC011; 1:bG6snQtTtXVj84xzT5EgwCuLBxazzrRFx1aqFSUrVZXd/MQpoEeZwgz15b3syjU+moJNGTjLjYAeijMa0gEMJ3e4eoPxh9c14YgCNrQaeGJnuGztgnFGm23zMVMgRdCokBlcf0aFHRh+xCIU8JL35QQy7+tPKjAXbZ5t7ppQHR7YxLRTcsGR/vcG1tFypPb1fX6FL7E0qJ/9TK1kwvAke1tDnff71iFPwSQwRKsQdpbrseDH21SExjXKPDLH74MZSruZsuON0P65JjJLIIGAs7sr0rhiRXCSykoUJfoYrkEwvDQ9BQ2hEDeJ0vfyBiD7B+r8ShgtqCpzACzIS0bWCDTJUrY3gqprb7zzKxP2M9X3suZWuTUAm3xjoxwG8swqUE540h9NWJ7/OjRZa5wFlBIxYjY1K4DyRGPRtDFW4+0/rgpfiB0kpTs55S/VJGF5A6MOePKnlwTGoAGrf2oifV6So+O99yFnz1+uJeD0BMddXV2kaB7rFby6yShwzYnCfSul2mIF7Vy5N4LSrePhuHZCJ/4L3Y0Y+8NlcVUfr/4= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b077f031-d148-4cc3-e5a2-08d48877b4a3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BN3PR07MB2516; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2516; 3:DuU2PiwqCL9Nzzt8dIO2W3UuS71OBNvWCEaDXSysECxLc3n8+GHl7wZDf22vRSdd+e7wGefL3sfC6fuCut1OZb8z3WE30pykbVIKu6GhfmRffKxanKBFx4zTiIoYxHTARF9Se+hdTy963arGK4JvyxillRnhdRMmQKWXe8O1Om32kd97F8oIvxywSyiJgMyMRxjufm1SjqKujhPwoY91OMtgk73jrDKr30SA750WJnYBTwZOZDK+/BkpO8oWgxwUGVsslFtNDVRxxDYiwwcKoGtwsnKw2y1Tn7BilYBLP7V1gzPiOznpvkTMC1eVzxxEPacdCWV+d04sKnhQr2AbfxPEC64jvDC1AD4AWmfgkZwT6r9KtrLnPpKEbfwi1pm7pV8huMuV4/pFc2oVaHrHzB72bpkMdNBxhErH8rMm7kZbEf/AbkQk24pdnMumToq1R8BF3DyiV8Aj8LWmOb++NJGNJLmzePw6FLB3OTuM1hb/D82hyRQSNqS7x3xz3e6P X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2516; 25:H3kKOMU8rIklk2Nzt+fe5AnqVILPf07480OY2PpLDcznglUbmhtboRqVBJyc5yw6vrd7eq98DAs5LjhBJl1v5KqiaEAjr74tYNqZa5t6mnEZGPYFJX2i1bHMdA6iVb1Qdm5Ty8RAjcEUHY9lDnBYN8SJvN2aKWvmkjQkqOnSxoDYalZj7uiDhhLT6Pc+cpGIl2L0z0WG+ciRB3UhjeKI3ynPOsWYEN2V100KEpDS2Ck30nP0RTuV7VI73g48cu6M4jx0gNqJZYiubabStw4lzIflOA3G/Hbr/nvEoemchbJFgDvfZBZNfSYrYOmviTCfYJdjEGRP9YBDR9ORPxbYHQkpF9xbHudWKinkmHxkWOM1l7CorE+gt+9LVjV46S3VhJVN9nf6QJMRvGRN1GOy8mzgmc7RD4SCJ+FzK2XfposEQfP+HiPaFHycK0fNB9ZwMlUEQRxi/9e17dbGE9iC9g==; 31:ILdYFc086EzyhwTANFoZzGyu4YYORZXvpeVV2UyR2qHB3qee8cLDjrWRDTJnCV6895vKjw2JU5Fe/nvMewsA892rXBUCo/ox2NMZOhfl89BXQJnssKEVjtQyiXq4XTibl3pc9J04DyK7sEWm6cD2tt1TjOLHe4iB3VkjksKW1pRGcYx2kWn9IXOvE+1tbFAI4QtxV4dMjlaZZDI+tBZulxhWejGtbBdgv0O0/AlimRec+ezz8UtvuP8uvv0stZzUlSROe9vZQrVYBAfRLEETRgQVvhw54iAnZ6MhGGjy4T0= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2516; 20:+PS4hlAPtp2txH+36qkZvePxWkyXpCiSitEKNFG+QQbyZK3+cAn/amY3QDY3nLNuyHDigtF/7bWYIEH3+LrwiQNUhAHeCnHAeyVTm9HNSQwhR5Molc5I8bEaeHHibctX5NjveXNX1grvbMJj4By49z9P8v5B5lpE7KCBaRVazcibJYqsuunGUSMrBnnm6BOJutwnpEUG5NkN0gO2vd0M+VnFZpSt3v984fw0v8Y+ZMEP2j3eGgrCg8yLiCaFCG5JNgTj3RizKSU+uSSCF+wvM7maih35gvbfYq0uNAMLLvmZppH5mD9GU14azIU1QP/P+gGJknM8H+yF1m/cvf6/Lj7AZKSRF9mwjo8qE+ZIs3So+iUk1K1CXnbFDtGgmQPGBYzY6/6dDQ1gHma95GQqxmRvZGYCl8EV/uQFSmhIS9z4UAutR3iEEGLG9EkGo8UCnRij16XPoXAK5sanMaKiO72kwaOYdGM05Hddod1/mnTr9jSs+Vnn/qEUH42IXJOb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13017025)(5005006)(8121501046)(13015025)(13024025)(13023025)(13018025)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123564025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(20161123555025)(6072148); SRVR:BN3PR07MB2516; BCL:0; PCL:0; RULEID:; SRVR:BN3PR07MB2516; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2516; 4:zPBDJCM/sqRanL1qWvVepnPUGCmdP3Lz1R6vMo9D5+iPWaZ0En4WiJM50me+2o9Zdat8AxtfdszyTUKtvgAM6ubJLAylDUhgDIyIoTyytapbdDVv0Zfa9VNGAEKKkZehgmxR/krFvDRhGlcdN4OYLl6jkGXNcAruCZ8hF6oVA97iyAjNrKxPVW6eBl2Iir3o9JBQ0Gi4GrbiK8tRF+ziBRXzhjoNE/uVakcnCy7SXzuZ1V/SV2elOazG4usCgB++TwXbXrYA8Pn8QBuuWdlPShl0HdMyFhA1awtOL4Inw6i6/J0WBoAnhIww4iNWLw315wA0TBGkuQDA68/6SK7Yr/fsK0oCY1egDPr/Qr9JYYYFhGMZ1DiSoob3G9VX6yOL7VyK8SG1cFuxtWYeatZCGtEEU7Bo6mmoAXglnwJKJYW+rIWxIadPpoJQmZaniIUOLEWNhBydZpZk3A3q+/B7Hr83Sma76/jblMH/rdPxGYYlsScS2XbRT0mr1Vooc7yvxceGWgV4MsS6bDneV3Gbt2xxtaycGIt/Zzv8G2aGV2a2bZga6f9/6hpq92DF3FaUapN6EfZqEU9FRVT5v0EsBcnjuh0Hcn3f/9q0KivVSKvhqAn1iJx02IEpRJNZjdp+d/3A1fCstjTDbox2/o7NEgn8h34JEhzOr9X1Zjp3UNhczaK9We1ZekVTAejsTf1m/lH7Bkr5nfnxnvJnppbndcxdEVgC67rbJggnQpKq1lfPxIAbJ9ghIpmlAm+dGZsE6ekpgSSwrofzWQRmF59hyio2o55HKtJ9vZQ9kDS3NWxXEq8kOEziJqx+8hVYJHE3 X-Forefront-PRVS: 02843AA9E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR07MB2516; 23:U6C6+tGxvG8+jwQ2pw8gjOEJt6D0XZ6MAZiO1npIm?= =?us-ascii?Q?nIaByUnQIO4t4RyBi1ZytkUDkXFkLGjB8fgKg9k0Cm4WThd5dxMmQtCSIx1P?= =?us-ascii?Q?jwQ7dhWDT6RSt8RTlVgYYsx38+XHNo+Y4GmYKiUrbVg3bSDdvbKyZ0kvZr0R?= =?us-ascii?Q?+pOIKg6AAes2xOwPWtjeRiGnepj8RTeA+BbxJYXL4LsMclf+MtY71EtSUc8V?= =?us-ascii?Q?nGdMoAOkGXt+ZiOabkRj4JZlrB2DSMAKdvHs5+ksBSygzopMoHa0K1XCNOq6?= =?us-ascii?Q?+xNrEvlxueKifW9fTlHMFV+FhHktvHvEpcyZ9Znvfkf/SVdluOwCaOnWNzZc?= =?us-ascii?Q?9MYJpxyBkqyX32DV+JUMgkUlAiMyVAmeWGHtqo23+DGMKvL2UJ7F9qxugdjY?= =?us-ascii?Q?s5m/8VsquqyDNjCxcWH7ESb/DMy2AXe77Ob24RhVMTnKef0vWiVGVIxXaXJt?= =?us-ascii?Q?uA+prvOFEmf8dSLJKMQbobYCKmRCoCQ5gfUjmzMzruJ/IGLLp8LRJ7NenCG2?= =?us-ascii?Q?jrvWDM/qfZOtqonWBBQ2inmAgSI+24EpIK1AtPRilDMQyTHDdMxNGF3ud/0l?= =?us-ascii?Q?uW0xYjgXzLIlgoEavderXt1wjrRRcSzvMae4gTLhCPKkQ63XQKmMm6KSiguC?= =?us-ascii?Q?aVQ6cdo5ls8WY7cAwmIMATEvoMVSrW6fapHjjwATBaFHMthxuBJXg+epZWDu?= =?us-ascii?Q?OcPK09Il3LdeSK6lnoMwgVxXZD+OCidXvv+HVV/EilHEkidMDBI2tLgzQDd2?= =?us-ascii?Q?s1GSAd38urhJbL5CN99wuIfqA/O32yYrm9PFMW9OSbEccVKUXM1GVWZBx2Y3?= =?us-ascii?Q?MYcNlqwVOMKhANzFyl8cM//+pqKcCRLGaE+ddMrjhgn2ZzaCujCcDdkEDk0u?= =?us-ascii?Q?IS8thxdXJ48fXpvm1TgURWOnqNEKTnAnCBLVQNqD0WlHsENtfGB3mCUGBP7d?= =?us-ascii?Q?CZ2AfShx3urDIBCCtGyj+mzEjz+XtCwzu9hpykq6SEaLackqAcfFu7SZBjZY?= =?us-ascii?Q?z38MngKITKFQSOhD/NxfwZ8ImJvpJQm0gfusXdWueBU4IcAyLV4Xjl02k+td?= =?us-ascii?Q?mn08qLPiQuWSNPZOKSbkdvgt8ZAwJc7lcTA2xtxVoBlrDZP3w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2516; 6:9Wj0SOdiehEuiYymZcMeTQWLlpnFlrakLlKsoAQ7zsYKqt4DublKMXymSoiQe7+1n/NButGw+ysXot9N/ablDiBUHQ7P8DhXWuNi1U9jwj0QFvuwhhIV1jI2vwuX0BnDJd60wsP2fZVHsjxhfPm7QJcLyB8MhObz10fPMEkXEac9VgId+txqkzFoLj541//puJcHCSGpT46ehkiSoq1xUNkK2AkI9+mh8l9zKJB15jkm9sfDJBn5JWnoNGKXeV9dzVEO33ZAHloEd1D8HoWu7QsbHMebYVF0J1vP/iAWmgyQAMKddkbVylkYS3qG0kZZMXQioZ0/JvS1OG5dFZMfo2bEFnMqIOdSWRnFo4KK1W/Ax/paSe8od8s8X+9hwUc1+IjFC+tBuJ4mB3mnJp1fQlDKSPBoj2eQTKKBVJYgtEzZ5EbcYGsoAvkWGHPm63Zw0S3pr/VyYpYw4K6i3pKBT7R7A5zGk7DmNrIzoRQ7FwwnyVLVCMANHnom74ZlR3lysK/aES77+KYeDV8yAep8QA==; 5:4Aow8s5PbTgfPYs+7sUs4DZYFsvQPy+08JuG/VXQqK2t6MIVB+2EZi0K8Bog1cq2foir1DKYVYJD17nmGVgS7sGr5K+ioUz4wDPIUts1ywq3r7W7E3KICBH2BojDOwI82MD4N8vFlsCJZyx1cE5wyQ==; 24:u/gjtrUmClhtAI9BCNEoIac6WWGl9fOEpoCy1C+ahKoJgd72vzBA7A+t+3UtHyz+bLzjNymtzqsdL37dT/L5pRF0OSvQTBfx2CYurUDuH5M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2516; 7:Z0AjglYgknhNAtqVJrYC8Yz+eRXlBfwhpjwz6kOpd15ABnoleJ6jt7wUnGUCzAAOUMgvBcL18L24uvtXRZWb/fmQzsK1LETaqRNm/Gm7IJ2nEObMnfsN41M8qPD6CDdqV6PZAAC+ZyGsuTiWQAktt7kdddvTmT7Dg9M9S64ik9BmZWQGF05qhzIxJIayYLwHVdAbJyj1QOoEavYCwbdoViSXOgIYLs8aZ2/iof4uVMEJiLq3LP2X7qus3w0JuSVXnyQudSAaBj0HK2zQMNmdABGDN8ay2ChftggRqDjtrhtXl/yb4ndu4mvU/Zn5EPpl9rBNDwooWNnJ63bxr0zL1Q== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2017 05:31:47.1408 (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: BN3PR07MB2516 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Yuval Mintz --- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 38 ++++++++++++------------------ drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 2 +- drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 +- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c index 2fc1fde..9b4580b 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c @@ -271,8 +271,8 @@ static bool qed_dcbx_roce_v2_tlv(u32 app_info_bitmap, u16 proto_id, bool ieee) struct dcbx_app_priority_entry *p_tbl, u32 pri_tc_tbl, int count, u8 dcbx_version) { - u8 tc, priority_map; enum dcbx_protocol_type type; + u8 tc, priority_map; bool enable, ieee; u16 protocol_id; int priority; @@ -613,8 +613,7 @@ static int qed_dcbx_process_mib_info(struct qed_hwfn *p_hwfn) } static void -qed_dcbx_get_local_params(struct qed_hwfn *p_hwfn, - struct qed_ptt *p_ptt, struct qed_dcbx_get *params) +qed_dcbx_get_local_params(struct qed_hwfn *p_hwfn, struct qed_dcbx_get *params) { struct dcbx_features *p_feat; @@ -626,8 +625,7 @@ static int qed_dcbx_process_mib_info(struct qed_hwfn *p_hwfn) } static void -qed_dcbx_get_remote_params(struct qed_hwfn *p_hwfn, - struct qed_ptt *p_ptt, struct qed_dcbx_get *params) +qed_dcbx_get_remote_params(struct qed_hwfn *p_hwfn, struct qed_dcbx_get *params) { struct dcbx_features *p_feat; @@ -640,7 +638,6 @@ static int qed_dcbx_process_mib_info(struct qed_hwfn *p_hwfn) static void qed_dcbx_get_operational_params(struct qed_hwfn *p_hwfn, - struct qed_ptt *p_ptt, struct qed_dcbx_get *params) { struct qed_dcbx_operational_params *p_operational; @@ -690,7 +687,6 @@ static int qed_dcbx_process_mib_info(struct qed_hwfn *p_hwfn) static void qed_dcbx_get_local_lldp_params(struct qed_hwfn *p_hwfn, - struct qed_ptt *p_ptt, struct qed_dcbx_get *params) { struct lldp_config_params_s *p_local; @@ -705,7 +701,6 @@ static int qed_dcbx_process_mib_info(struct qed_hwfn *p_hwfn) static void qed_dcbx_get_remote_lldp_params(struct qed_hwfn *p_hwfn, - struct qed_ptt *p_ptt, struct qed_dcbx_get *params) { struct lldp_status_params_s *p_remote; @@ -719,25 +714,24 @@ static int qed_dcbx_process_mib_info(struct qed_hwfn *p_hwfn) } static int -qed_dcbx_get_params(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, - struct qed_dcbx_get *p_params, +qed_dcbx_get_params(struct qed_hwfn *p_hwfn, struct qed_dcbx_get *p_params, enum qed_mib_read_type type) { switch (type) { case QED_DCBX_REMOTE_MIB: - qed_dcbx_get_remote_params(p_hwfn, p_ptt, p_params); + qed_dcbx_get_remote_params(p_hwfn, p_params); break; case QED_DCBX_LOCAL_MIB: - qed_dcbx_get_local_params(p_hwfn, p_ptt, p_params); + qed_dcbx_get_local_params(p_hwfn, p_params); break; case QED_DCBX_OPERATIONAL_MIB: - qed_dcbx_get_operational_params(p_hwfn, p_ptt, p_params); + qed_dcbx_get_operational_params(p_hwfn, p_params); break; case QED_DCBX_REMOTE_LLDP_MIB: - qed_dcbx_get_remote_lldp_params(p_hwfn, p_ptt, p_params); + qed_dcbx_get_remote_lldp_params(p_hwfn, p_params); break; case QED_DCBX_LOCAL_LLDP_MIB: - qed_dcbx_get_local_lldp_params(p_hwfn, p_ptt, p_params); + qed_dcbx_get_local_lldp_params(p_hwfn, p_params); break; default: DP_ERR(p_hwfn, "MIB read err, unknown mib type %d\n", type); @@ -895,7 +889,8 @@ void qed_dcbx_aen(struct qed_hwfn *hwfn, u32 mib_type) qed_sp_pf_update(p_hwfn); } } - qed_dcbx_get_params(p_hwfn, p_ptt, &p_hwfn->p_dcbx_info->get, type); + + qed_dcbx_get_params(p_hwfn, &p_hwfn->p_dcbx_info->get, type); qed_dcbx_aen(p_hwfn, type); return rc; @@ -903,17 +898,14 @@ void qed_dcbx_aen(struct qed_hwfn *hwfn, u32 mib_type) int qed_dcbx_info_alloc(struct qed_hwfn *p_hwfn) { - int rc = 0; - p_hwfn->p_dcbx_info = kzalloc(sizeof(*p_hwfn->p_dcbx_info), GFP_KERNEL); if (!p_hwfn->p_dcbx_info) - rc = -ENOMEM; + return -ENOMEM; - return rc; + return 0; } -void qed_dcbx_info_free(struct qed_hwfn *p_hwfn, - struct qed_dcbx_info *p_dcbx_info) +void qed_dcbx_info_free(struct qed_hwfn *p_hwfn) { kfree(p_hwfn->p_dcbx_info); } @@ -985,7 +977,7 @@ static int qed_dcbx_query_params(struct qed_hwfn *p_hwfn, if (rc) goto out; - rc = qed_dcbx_get_params(p_hwfn, p_ptt, p_get, type); + rc = qed_dcbx_get_params(p_hwfn, p_get, type); out: qed_ptt_release(p_hwfn, p_ptt); diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.h b/drivers/net/ethernet/qlogic/qed/qed_dcbx.h index 2eb988f..414e262 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.h +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.h @@ -119,7 +119,7 @@ int qed_dcbx_config_params(struct qed_hwfn *, struct qed_ptt *, enum qed_mib_read_type); int qed_dcbx_info_alloc(struct qed_hwfn *p_hwfn); -void qed_dcbx_info_free(struct qed_hwfn *, struct qed_dcbx_info *); +void qed_dcbx_info_free(struct qed_hwfn *p_hwfn); void qed_dcbx_set_pf_update_params(struct qed_dcbx_results *p_src, struct pf_update_ramrod_data *p_dest); diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index fad7319..6d24308 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -183,7 +183,7 @@ void qed_resc_free(struct qed_dev *cdev) } qed_iov_free(p_hwfn); qed_dmae_info_free(p_hwfn); - qed_dcbx_info_free(p_hwfn, p_hwfn->p_dcbx_info); + qed_dcbx_info_free(p_hwfn); } }