From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0075.outbound.protection.outlook.com [104.47.2.75]) by dpdk.org (Postfix) with ESMTP id B101B8DB3 for ; Tue, 5 Jun 2018 02:13:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4QAcXRevWVoUhkUPztnicDXLECGAsFs4/7SaYOvWdMA=; b=fusnetMYYIqkgScegb59/exyZA2znbMymTwJNTm4ypfSiPvtfX9GiZjdxL5OCi/xFGfFdQnxTEGVdVFAPMU+ZVHU+R8w6EeK7tfLm5E9vv9jkENb2FYSEMalzrDq1TvFmoCbhtZuzQT1u+oB5z49Jmw8vggh5ji1/7XbFbPBwtA= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:13:04 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:10:59 -0700 Message-Id: <20180605001129.13184-38-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:30fvxfSiE33v62PuLsvILFhOg3QaKMNGVb4u4ZKeycsgy5cAnfLmHKYQN5/RR8T1BppSVo6KUmaSJbIrJCvPPJh4k5bCO8m8whz95667vsX66fnyRuDHoRhdyw6DKCxpuYTbkz3eAcitH1V+VIBQ/YWgU4wcwD4xsJj/neaIUkvaMSvCCEAFbeLXmOcUuwsECyIAEH7tVUzmcH2vHrEtaqy6U82VB4yWNHMd9GGVZzTAhcuo6RzStFMe6YfUZriG; 25:ljAow6MEabWrGTo8o8/CLA9B+VUyHXQ0O5wQ0jnLeA8msavTq+d6A7QGS8KZAOhV0w0GBx5gGw1qGfA72LbfXG8sMrplhun4MTIKkrVX2JxHFBGwTkfplhwRxlmpxsnUyQ1FmDXJrsgMNkETu5lyHnQNklFn0QLK+mZlLtdWW4q23UwvB9nMs32F/UEK+YU2hK4r1PY10lcTqxpQSifndI7ugWhJmYNUqG6kXyEcQwYTdhITVD9KbUvj/re2ldOK0ynqm97GOrkPt7HC1WLD1wiVetUBa5G02UiU6TnvMYJvi/PtTTXkD25MaLOZ2l9QDC3jtraIiInsX9zS0DGZ4g==; 31:X5lmdbqynSLGyTu1tWWRqeZcb4dkLsZ8LYc7nwchB4BU0oPVCNqjqasix2tDi48fS28jkOWx0/7wAIoWqrUiZdmPcvnIAPmzmfPIaJ6iacyC8nSyei0g/0UpRdZ8VfpCEp9jq9MhrZAxKGn7v3Z+Q7HpUBdXngKT8RVoRheOYHaZeQo6k8mRN7NvGBjTjPxtiuvn2wLUzjy/rhQb26vGVZWMCRVC+iSuWLZ5iqS5MQk= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:wOnsg81FUv+xiSxKGpknpi/CyJfT5x+jw9NTnz8JNY1rCbGu+8/JZArxN7OHz0t83fW/0NG5Gh1ojETmuNIr7yWPLYh2sSnSOqaORC9z6cbkpTXqIw+6q+sdYfBqB9N6/6rQBGrsFRHoDWg8RMkfSgHbl4TmYrgbMIVoe0HjKVpo+HA8D6nt+O3pHH4kxcYIcqs8PP2MdvRtbsRUhIR9ldu3R/t1Hj3azNGbpOYXnj1XA2AHujHy3nWH7B7I73o7cTpiMyCnFHUf3jSZtvicS2p8I4x1OMFcEFgEPL5vA39x4FyHZt13m+DCj57yL+IJKBZNfk3BD46Jqor3PWQkLHl1axJ7ggGPo59W4Pk9nZlmO8Qum4h5NEdUm9lAzV6QgjjhgFzAL8FODWcm2IgHQ5wMuJXSOc25NBsKc0Zb9JLzq1KnFAq0pkHjvNH3lgw7pmSY1iBC/xAGUzcrph4SgUTLssW0RPYRiWHm+PoyVEFUzrbR7sAvceHhlsjWIOmE; 4:zMagSqhWq0Z5YHWiI4qonSk6uYB4jfbhrTMpFW1wcvAOAJwiAjIhme1LOELGGqPcmwEGM1T+aIYOKJ5risvNkmlM/puGDDv7hKDqoG0kPSLLLqXvXNMSSy18rMbjgyHX2/pnm3iLwAwxKOv0fZiCZ47u1Ff0tufSS02GNzQyAzGhbu8JgEDHEVdzcnrxGCBDDSMjRWrbSZPuT78IM4xVO1HKMj++2XpkgG4Nh0BcWoHxgFV7X7I1IDQUwEioL9UYmYYhpvXAu7cxKSEbsLilqGjjvc1aTzL2vCW6yeqfii8ClqvlJj1yVP7pkivR3kqG/0pdYJLBk42yOgYqtRZF6QDZVUpuK0qPeLHO1kUCvFk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699)(17755550239193); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(966005)(81156014)(76176011)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(23676004)(386003)(446003)(11346002)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(6306002)(2870700001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(105586002)(69596002)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA1MDFNQjIwMzY7MjM6akRURC8yVWdqbFhxQXhsNU1PR3lTekF5?= =?utf-8?B?aW00VWYzTXdpTnpUTGdQTmNaSDg0dzdKS0xyNkczT2lSS0RkRms1Y0NJbktk?= =?utf-8?B?SlQ1ckYwY29BeDBKbTVnQ1NpMDBKcVNlYlgwRlIxdHVDTUJkKzE1d2NkalVI?= =?utf-8?B?azAvT3YzaVJVZ1BzbStjQVBHT2gwMHM2WFBRNzc2d3NzblJhQStXaEVxMnIv?= =?utf-8?B?MlJybWxGYU1tdHYyYk9oTmc2dXdQWGM5RDdibHFxRytRWHNseUxZVEpLNGpI?= =?utf-8?B?Qmt2TXhrTHFVRWFkVkErTURxbVI5M0xzdjgwbzM3NHV5ZUlVcE9tUXVrNVVZ?= =?utf-8?B?MHVnSXIyRFF5dFd0T3FUS05CbFgwQ0dubmdNYUhTRGZpY1BrenBYak1sVnB6?= =?utf-8?B?K25JYkxHcUwwaWlOZkFLZzJYbThkL0p5MURYYlZYUzN1SjdZbkhXemFiMlIw?= =?utf-8?B?ck9XbUpRVDBSMlZnd1orTnM5Y3pFemg3SnhMb2c0R01yY0kyaHh4OVpYdk1r?= =?utf-8?B?ZTREbnB0WHNYMU1tMjZGOWN1Z2tFWkVBS0ZBczRnQzRMMDlNT3JtYjVIZ3Ja?= =?utf-8?B?c01nTDd3NnZ5QUtvMjlmajc5dnlaTklvZTlxcklUN0Q4bzhUS2tPQksra0Rn?= =?utf-8?B?UG1RdmRkUlBxNE5pUG1HRS9vMW1FaHNZTmc0MFh3aHlkOTBnc3JEdmVyWUI5?= =?utf-8?B?L0M5T2tCb2E3UlEyT1dyM0x0RzNHQ0ZINGI1NUUrNnBvNW5pM2pvY3RUVytW?= =?utf-8?B?a2lZZHY5TGxyM3l5WTZIaXAreFhzSzBiUHZ2Rk5ndFhZWXFFRDFVdm1FdGxU?= =?utf-8?B?eUtJOUtPay9VTWJNN0RTMEFUd3JvT3lCV2hGdUNxUWNJY2ovK2hRcnJwUytX?= =?utf-8?B?cW9zSTVZdXVQU1FOMkJhTElQVzhPUTBEMUZuc1o1dDFGUzBiblFLaDNyNjJT?= =?utf-8?B?bGpiclpnZFNLM0NtQ3g4bWY0d3FMZks4WnBxdmw3SHlEMk9UKzl6NnNCNnlh?= =?utf-8?B?TGZteUxCbmZMVC82ZzVZb0xxNmRPdE81WGV3c2tCNlZnWU5wNVY3RzA2UmVI?= =?utf-8?B?VVBaY3cxeUFSMzhWdENxc055eXFScHNxeFkyc3YxM2piNFNjMVc5SU9SYkJY?= =?utf-8?B?TlFkemVzaHNMZHZVcldieEZ0R1hlcloxaU5JT3c5UjRKTUxZYisvNkd3RWp0?= =?utf-8?B?RU9jd3V2c0luWXRXM1RheHE4OWU3YUFaQm9yZjBjbHdVdUJ6aTZZQkxpZFcx?= =?utf-8?B?eUlMN3QraDEvYXlOU25mSmJaUHNQazJsSjdGNnV3U1V3eXRMNjhtMFJ0MDdo?= =?utf-8?B?ay9iTFpuWjFOY2hiVkVIMEVXN3V2Tk5wWUYxcThKWXEyQXd0UWdzNVpwOWUr?= =?utf-8?B?bEV1dDVINCs0MFZvZG9YeDNvcmtoRVp0TU43Z2p1eUcyaTNNRXhQRWFwZDA5?= =?utf-8?B?V3JNWlptQzUvVWtJalg2bTA0VkgzN0VaRnFHa09BS0ZheVIyVzJobEUzS3lB?= =?utf-8?B?L1VEZ0wyYjlMYjF5aHlVNlpZQnhmMFVOYUJYaTJaR3U3K3lxMGw1R29zRDhj?= =?utf-8?B?ZGNXMEprdzVLZC85K0MwOFh3MktLRDhBdkVqeXppK2VRUDZNYi83VDdybkI0?= =?utf-8?B?U29iUVRrQ2hick5KbGhuSGhKVms0L2YyMC84MG51NzFPUzRURFVEZmI1dWRu?= =?utf-8?B?NWNFT1ZWMkJhdi84anJDM29hNEY0NFBmS2hhUmxmaGw1Qm9PZWQrMXo0Vnp1?= =?utf-8?B?RFZ4SXR4ZlVqL2x2OFA5RFZ3PT0=?= X-Microsoft-Antispam-Message-Info: DUFpKMY/tqdgKwLJ+4JyUs1ZV2E5OXS+0peSc+NziDIugMWa8d75bRanO+NwxsMJW9dyBLQTQjuDXOjTy10+K1Y9XenejGiWZfuDhNhVWubxUiebKfLo7vkw26nt64N+PcK7Ehw0HAb+Y/NjNl6YkCahIvtbXWdpo9OZLOGulT7rdy3eU9KgbE1vYt+h4e1j X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:s5v19NHR+DoVh4bwEQuRZjyKyQTS3KN3lOT2uuBoQ9EI1pT9psMgl4HnsgESlNM/jHDb9JsDESCXrLhd1UWcn+n3fNwmbSpAolhRusxzKTerj1p/GYG1nMNa4I45kBhnnVAAe9Zy6RScWKs6JCYonsBYMWmnoBSlLH3nEn/6HAgvVd5W3QPsT2TYmsGFDk7mRCmEiEn3HCmoJfR8eyy2sv/bThcpvJ99dkj27W9tskNeqj+CTlXagUfSGbG3dclCaXVlUSPGF5iSVIfwHaYVLr2FsslvWlhRHrKsOl9zwYU4/QXFoljrcfs206P2b6ivyqZrWl2SIvssSCFEO6zD6goXFAuegggsYdR39JiadJPLjggVQUzfAOdjRjkFeFPcwLqnmn4ibEplT16hxZb1BeDiktI+GRXWajd0QQwELm4UGg/4uRIfsiOE4uwWWfOT0AMV6hVR/ljjzU1G/hatBQ==; 5:0w1asT13au0FttB1oq00uB3YdUAIxm9tKqo5tIFuC/hf0J4UxddIKZtj+ck0nv1D9mO+iJHr2HHPkh6A7nSwF4cneTF6/2iB1dPYNPqyLv8Zj4tgi7VfLMcCteCrS/zs4weEKfWDbZBnox2LDST7y17sR8X/eNNvgKX55FzfDBI=; 24:hZtpi0usZ61G7KE3TlbJN/zqZjFIsdcNvUBVUUCQb1varw0D/Qg8xs8T8x0ishyxsiEyv6yFR4DQF7z4pZavkyRV+VZXMfqfZD2xKFDrD6o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:IRzEVMdM3WsnPTiD25ZrvUfTSUnDDxQ8cxSe2/q1J+eQhGHr/4EsVapxt+uKqJCSi8ub70VkZhlUCRTHRRl27i3pKF0oF1E6/JPe6u/CfaYDPiDor2EdEVjqHn/XsNEKOU+XkSOhpVy85/HquUULltb5UOWVtQK5kFlYX69zXZJ3di4KqpcGtNUMl4UQ3TTu1ThRk6Xk7pUHK+WelHk9NPDqWTWid2Zu/YMuhaZOszGFovUP/zalIbfa9SkO8FJv X-MS-Office365-Filtering-Correlation-Id: 8c26e411-c73f-4da9-11b1-08d5ca791c59 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:13:04.4495 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c26e411-c73f-4da9-11b1-08d5ca791c59 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 37/67] net/mlx5: fix icc build X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:13:06 -0000 From: Nélio Laranjeiro [ backported from upstream commit 7b2207afe86df58b571e722dcee14734e91cdb2e ] Remove the second declaration of device_attr [1] inside the loop as well as the query_device_ex() which has already been done outside of the loop. [1] https://dpdk.org/ml/archives/dev/2018-March/091744.html Fixes: 9a761de8ea14 ("net/mlx5: flow counter support") Cc: stable@dpdk.org Reported-by: Ferruh Yigit Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh Tested-by: Ferruh Yigit --- drivers/net/mlx5/mlx5.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 853599c25..858a6c108 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -796,7 +796,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_eth_dev *eth_dev = NULL; struct ibv_device_attr_ex device_attr_ex; struct ether_addr mac; - struct ibv_device_attr_ex device_attr; struct mlx5_args args = { .cqe_comp = MLX5_ARG_UNSET, .txq_inline = MLX5_ARG_UNSET, @@ -851,7 +850,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, err = ENODEV; goto port_error; } - ibv_query_device_ex(ctx, NULL, &device_attr); /* Check port status. */ err = ibv_query_port(ctx, port, &port_attr); if (err) { -- 2.11.0