From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0063.outbound.protection.outlook.com [104.47.1.63]) by dpdk.org (Postfix) with ESMTP id 664A4200 for ; Tue, 5 Jun 2018 02:12:41 +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=xYV99l1CkGnBE1fthsmvjlHuW2bg75odmNrRibfOu+Y=; b=Ik5ytp+jhYBYX9QxKGA4/dIMoNj1VaADxbSmcOgRYNbFBnbZX1cqp8xhWLqhtiFW4fbSKOTVp+uRDND5ntht0/HNsZ1+HiA2hUA4AcS69YVJ4pPJ6PoHLhibA9LdxC6dFd01IU0Bys1p8G8gMObf4Q6u05hiTZBTLFHh5kGTeyw= 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:12:38 +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:45 -0700 Message-Id: <20180605001129.13184-24-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:AedPkHi0fajcgVsWt7uXIhpLzuQdv1JuQxgKmt3u1B1kZs4eHe9qfvO9BX6jvrzIedrFaGL23rL7azBB26zGMm86QgFwCxSeNEE5FfFh+r20uzOAUWnqDItD0xali7fXDrVugQKs8H/AEwY48sRrYyWFCQPDXlnUSFIrmCQ2iNsfaeKfjU0LEXu+hRxQ8vDrCMKAEdZDtvfhRGod+aCIuwkeNUo8L0UiTUVUje5kQcPICzyk5iap2fQfwfOodxSq; 25:rsWJ44iMfT58ae4Nlkz+ccL007MYXjOjUjOPjVGSTsFg0HVF5IjLJ9dpoSU3274tEqYoSoE9ffXihOd4bF87T+wt8HjY5Glemhcy7FaEG8l5TyNt7SMtbC+IALS1All/V/YBUmIKCWeySoWujA3ZxHloKgbNc6Z5lvgj9msXSwtuVTO5v809TJ/CNmU7S2LIx0WmENaxvZbAgK+TdgMu6P+HAGASBnu3JM2G2FC6D3RP0/29qJif8qGgeluJNn++sMutKlxswP80DNn8kYE+0y0EAPhLfKU3jRRpE6002vFGbzq8uWzFRF36YOELQXaeApJsUka7vRP6FP8X3SVUhA==; 31:YVDzsrKpYXGTkP9RGs7234LQGOan9rb87Lqrc4D5mge7TtD2GA/RlNQp26GgfXbIQwk5TJ7GG3+/D1X4KVkfoalN3izx2BSVwSu4nDMhgEjvlsHpZL5MrCSYiHrzwNsq2PBy96YueK4ufnNjr7gqu6lgK8M3d8TKYD6oUWNNmR7ck7ylnAhIYq2BgyZuQ+8uBKUtde08wZKJ4AfHaNJ5B1QN5EPH2bCQoKI3KoPozJI= 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:AHqsS5JzTMfsqwrh+gdi5FdxJN6JktI96Ccp/dKbGWA0tAcNIp4fMezBI9bhuD8PHy5XwBzBbVLFyI3rKc1KD4mQXeXPCBgzgIy0ULcsdJJE7U0JvUqlZmxzaRkq/1Yyoy8XdttrPieQ0YV2ZuBTh9dP+HnHchB7pRcmElbDDVsLybbK8gRFrKwmUFGYrhJniTLGRP9u1qLjJAJ6GB/tMpGz9cgGhVdmmlj37AUo+hhHPxbynckLgcHpQaY3XuOozMD5hpMJmHphLm6mHj4xfnR58hDKdYLlxz6KYp+xgMhRdHt8mK8qhkIETEE5qHKnap2h/R9qaIEPx5ho2zzkFWrf0HBJjoDhbxqjPdSJMmdmuwboKWxC1Yo72f+wXFt4SoOc5kxeVc+1zx7IMufWwCPT9xY5YH5QRgU2g6ztDbiM/yyy0nh+DUrwyXkZ1HM45jqxwFjwmszsTVDQxL7I/MhsUA5KTvOx+jangA9XTIA3e+T3OIMXOccLaBOECPEP; 4:Umt8q2Tl1niF+h7Apt72mDC/421zNYBCdjTakrjijyHuLxRlS0Gz5MR0Y2E3sVU+XU7jC0uQEOR7AjouyqT19fY7cCG6qDpoq4B0rg/OGbBQnIsczxF3W4A0i31J9KCtez2ecM52ibcSDSizDLsKKDeDYt/XQC2XtCC21kzh/jvg0gXo8O2WbizkRLqmbbSc9ZLt0QMUC3VRXXfhOKfeUZ8vgYyass/4Zacxi1OrxPStjTLa0hnB9JBVbKXYNaUFftrU7rw+M7voF78J5qWhqg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; 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)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(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)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(2870700001)(5890100001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(105586002)(69596002)(68736007)(7736002)(21314002)(309714004); 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?MTtBTTVQUjA1MDFNQjIwMzY7MjM6YXFLeDliN1V3SjU2S0sxSnV2TDdZcDZQ?= =?utf-8?B?eHJPejhsYlJwVDRJZGVRSzJDMzlzSXRuZE4yUUhYa2s2QU56NHBIYmEwK2dq?= =?utf-8?B?YzZia0RtWC92cGtZaWZyR2tlUHY5Nyt2YU8xZklybGZVVFVtMFFMK3dFNWNu?= =?utf-8?B?cEFwbzZlbU91M0ZPNnJtOENERW1obldBUm9wbUZuU0JJYXVpOGUwYzMyZDA0?= =?utf-8?B?bFozVDN6bXpUbWhVNzAxWUhMNW5qYmgvZTVwSy8yZFZxZFgxeXU4L2VvMm54?= =?utf-8?B?Tzc4Q2tCS3RyWWFCcUwvemYzcGQ5bkljeEN0U0VQOHBGTm9pTG9Ha0RnNjQv?= =?utf-8?B?aFY1dk1aT1B4MEtCZm9Mbnk4Tnhjc0JtSE4xYVFFWFVldWdKeXVmaGo3Rkcz?= =?utf-8?B?VG1vK0VEMko2QTJFNlg5Qm1OUnVhZzZiQmcva0RBOFRyVHJjNnFkQjlJRWQ0?= =?utf-8?B?Sm9sOUpvdTBubDEzN1p4YlZkcFZsOGRDeGllSmU1RDJLb0lpbDlqYXFNMWRp?= =?utf-8?B?cVNOOE1oTG9RVU91b0NLR21SclhjYkp5Zm51MkZtSmp0cjZDU1RWY3oxQjVY?= =?utf-8?B?L2hmSWpMQUZrK0hPelNwYmhOL0JheWdSRm4zRFo1dGdnMmJUQXg1NkFtUVdG?= =?utf-8?B?MHF2d2traDZKVjdiakJkSVpXYjJaQmlpSmduMkpNOXpLL1pPRGhMN090ZVpl?= =?utf-8?B?cFZhalp1bzZjdXJtQVllQUhoSkJWMHM3alBxamZ3aGtpNWY2M1N1L1h3aFR4?= =?utf-8?B?T01LdTZsSjRMMHdvMWFHNm1uTk00QjRUa1VEekltTDNmaEswN3JEOEJKTWNM?= =?utf-8?B?NWljU2Y0SnA3ajVjWHllZ0RmWjllNFdONXF5c3QvdmNBTUhsMGpyR3ZKdDFJ?= =?utf-8?B?YjRnbnVUV0UzbUhVaXE3d2dpWGw0NnhobThGYzdMc29WNkNtdldBdXBSQ011?= =?utf-8?B?L0NlSFd5SW9UbFkwbkVDckpvNkZ4MzVNeWwxQjZSV2JqcW4wMFpMVkloeFpK?= =?utf-8?B?N0ZGZW0yTjhVL2hYZEM5YkY4aTQ4djQwWVZLVzBNd3BrcXE5Wmk0akJucHQ4?= =?utf-8?B?REFjOEdYdkwxaTk5WiszaU5NY2RKNWZBWGg1WERBUGl1Y2Y3TnA1UkFGQ09k?= =?utf-8?B?ZlhzVVhGTVdoVzNHYkxCQ0NLc3JtNVl2ZEdIMm4wcFpxblBYc0ZNQU9jNTBP?= =?utf-8?B?WGdBVlE2U1EyRVgzMkpJWk1sdFNOeCsydVJkN2I3QWE2b3ZWTldkVjkyMG1a?= =?utf-8?B?bDZNcjJSWnpPMXRYb3pJdVpReW0xTVZ5NkN6WiszL3dXb1ZlTEhhNkZmNlZB?= =?utf-8?B?RFdLZlFxOVVCbWhLcGN0bkhJZ3NjajB6RStVTDJaaHcyTGkvKzlySXg4Y2c2?= =?utf-8?B?TWJJK25sc2lKekhGSUlod1gvdDY0RW04RThHMEpjY0hCK2trUEg4cXVCS2tU?= =?utf-8?B?NStWelpicVhvSzlzai9NWVN5bzIwekk2aHQyNklJS3o0UmRIanNES2FIUHVF?= =?utf-8?B?TTNrcHBweS9ibDBmK1ozNzFsTGpJZHIxaE54YTN5TWVLdnc5Nyt5K2Zza3hK?= =?utf-8?B?NlpiTkpRZ3NPNzJ1azYydWVPblNCVjV5Vi94SXRVMkluOUtOT2hhMmlrbk9l?= =?utf-8?B?dm84SHdSNDczVnYrckJ2YWRVaDVQQlQrNDYxelhpR2NkajgwcHJtY0VqTndm?= =?utf-8?B?MXVZMFZFMVJyVmt1Vmp0WVpmbjluYVJ3QkJoNFVlcEQ0OHdWRExXdDFod0xv?= =?utf-8?B?REFVbEhzVmkxS21WbXNSMFpZYjRYYnIxNDl2WVpOODFDTXZyTUk1emJ6SE9Q?= =?utf-8?Q?fPg3zdhz9+8LRb8?= X-Microsoft-Antispam-Message-Info: urJRbZdPplz6L6qi1uSPCTWqwQuFIlkoGY78u8ADTDfZDS49q8JvdCyc75ReRRpPKDgZJvAjwFign9gMxg4AzcGRvjH3kOT4lGzXGZ/4n7WVBZNnl+0SQtGLD0jQCzst7QVZgQZA+PuSnyEs0ggdoSGBx3mMYo6VGkmapTHn38vudndjnIi1sQYEYqX+gd6y X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:8lt9p02PWd0f0ETWnxP/2TExxWlhybsJCFwy9TfX9NNeYc850tXhauQRKHTfd1OaSotohzIhLhcugsQEI3qaap6WW0uUdcH8fvq3gUcL3xP9E/fs+dttujtIBlmSXo/dToqCrU6NUrkf4qzSFLflQtMFU2BdczxcQ1gClfJPkiyB+Wj7D8Y6HjCRysvtToNyBEmS2om+4JK3CEZkjy457PbjVfwMdjl6jsUVdBC7fgmNoiUQ3KtujsYMWdzGroVzCiPZDk0qhC56B3/KrELqYzhgnz6YgX4zDZqujyWj6OIPOnHmkkevioShwy3YGNrkuqLb03WnANZ0PmRXHxK5Stc6VZ3TItvqjNtVIhxvY4vhVZFJdJ1OPCl60pCacwwaXVS2WUVPdHeiN0155exq6tPeXkOedRtzSti7+myLhfzveTu0i66QS2ymGGmSuyjJ5M62UlUTykBYf6HT0KE0uw==; 5:U/3xrrn9YgehV90BMEcoOyiKfpQij6+6JGsyXw/QRB13/Sapr6ChfKqbSLAg1qAXvj6LxjS5da6l7/15UPlfXRt2oVE5qff/qc9HozbkKp3VWePVnirLs4lXBg+O/sDRCuDvdMk6IS/Y3uktsBc8PVHsr8T9zoisTD70Gss/UeQ=; 24:coyhFAk48L2z2bYtS1wzHX/KdYaae3AAgpSos47pZVVblzhSIOA71rRJ+3QEg74A9l4u131v/7av8pqFgP09S4Ozn7ntePWfSHje0ePmtr0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:hK51K0B1fB6BNjs31Urd0zDIAuXS4d3CjT+4x/8HpQt6fFUWHkAWDDE77gjjurn2Gd+U9FWIA2M1+Fw0BUEYD7tGBaFitDIwY7IGRjUH8Lx0CdwC9C+d33PkiMyZoZJQ8eILPiX5T91yxUk9FGjdIYm1+mdBJ+iqknkd1nphbleNpcJ8Yju1gBtT+nWfp3VLnzCBvTSh0YhZX5vK/lvS3wUZd5r7IvrrjQM7dt8IF28jV2eWgpQf2y8V1bBNlM22 X-MS-Office365-Filtering-Correlation-Id: b6b542ca-d25e-4dc8-0ba6-08d5ca790d02 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:12:38.7133 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b6b542ca-d25e-4dc8-0ba6-08d5ca790d02 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 23/67] net/mlx5: remove useless empty lines 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:12:41 -0000 From: Nélio Laranjeiro [ backported from upstream commit 0b3456e391a6518e26c60ab2aa6546964d46a6f6 ] Some empty lines have been added in the middle of the code without any reason. This commit removes them. Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5.c | 22 ---------------------- drivers/net/mlx5/mlx5_ethdev.c | 7 ------- drivers/net/mlx5/mlx5_mr.c | 1 - drivers/net/mlx5/mlx5_rss.c | 2 -- drivers/net/mlx5/mlx5_rxq.c | 1 - drivers/net/mlx5/mlx5_vlan.c | 6 ------ 6 files changed, 39 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index efcf86ba4..9ee9d2c36 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -672,7 +672,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, return -ENOMEM; } DEBUG("using driver device index %d", idx); - /* Save PCI address. */ mlx5_dev[idx].pci_addr = pci_dev->addr; list = ibv_get_device_list(&i); @@ -733,7 +732,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, return -err; } ibv_dev = list[i]; - DEBUG("device opened"); /* * Multi-packet send is supported by ConnectX-4 Lx PF as well @@ -760,7 +758,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, if (ibv_query_device_ex(attr_ctx, NULL, &device_attr)) goto error; INFO("%u port(s) detected", device_attr.orig_attr.phys_port_cnt); - for (i = 0; i < device_attr.orig_attr.phys_port_cnt; i++) { char name[RTE_ETH_NAME_MAX_LEN]; uint32_t port = i + 1; /* ports are indexed from one */ @@ -788,9 +785,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, snprintf(name, sizeof(name), PCI_PRI_FMT, pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); - mlx5_dev[idx].ports |= test; - if (rte_eal_process_type() == RTE_PROC_SECONDARY) { eth_dev = rte_eth_dev_attach_secondary(name); if (eth_dev == NULL) { @@ -820,15 +815,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, priv_dev_select_tx_function(priv, eth_dev); continue; } - DEBUG("using port %u (%08" PRIx32 ")", port, test); - ctx = ibv_open_device(ibv_dev); if (ctx == NULL) { err = ENODEV; goto port_error; } - ibv_query_device_ex(ctx, NULL, &device_attr); /* Check port status. */ err = ibv_query_port(ctx, port, &port_attr); @@ -836,19 +828,16 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, ERROR("port query failed: %s", strerror(err)); goto port_error; } - if (port_attr.link_layer != IBV_LINK_LAYER_ETHERNET) { ERROR("port %d is not configured in Ethernet mode", port); err = EINVAL; goto port_error; } - if (port_attr.state != IBV_PORT_ACTIVE) DEBUG("port %d is not active: \"%s\" (%d)", port, ibv_port_state_str(port_attr.state), port_attr.state); - /* Allocate protection domain. */ pd = ibv_alloc_pd(ctx); if (pd == NULL) { @@ -856,9 +845,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, err = ENOMEM; goto port_error; } - mlx5_dev[idx].ports |= test; - /* from rte_ethdev.c */ priv = rte_zmalloc("ethdev private structure", sizeof(*priv), @@ -868,7 +855,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, err = ENOMEM; goto port_error; } - priv->ctx = ctx; strncpy(priv->ibdev_path, priv->ctx->device->ibdev_path, sizeof(priv->ibdev_path)); @@ -893,7 +879,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, ERROR("ibv_query_device_ex() failed"); goto port_error; } - priv->hw_csum = !!(device_attr_ex.device_cap_flags_ex & IBV_DEVICE_RAW_IP_CSUM); @@ -938,7 +923,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, #endif DEBUG("hardware RX end alignment padding is %ssupported", (priv->hw_padding ? "" : "not ")); - priv->tso = ((priv->tso) && (device_attr_ex.tso_caps.max_tso > 0) && (device_attr_ex.tso_caps.supported_qpts & @@ -1003,7 +987,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, /* Get actual MTU if possible. */ priv_get_mtu(priv, &priv->mtu); DEBUG("port %u MTU is %u", priv->port, priv->mtu); - eth_dev = rte_eth_dev_allocate(name); if (eth_dev == NULL) { ERROR("can not allocate rte ethdev"); @@ -1026,7 +1009,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, claim_zero(mlx5_mac_addr_add(eth_dev, &mac, 0, 0)); TAILQ_INIT(&priv->flows); TAILQ_INIT(&priv->ctrl_flows); - /* Hint libmlx5 to use PMD allocator for data plane resources */ struct mlx5dv_ctx_allocators alctr = { .alloc = &mlx5_alloc_verbs_buf, @@ -1040,7 +1022,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, DEBUG("forcing Ethernet interface up"); priv_set_flags(priv, ~IFF_UP, IFF_UP); continue; - port_error: if (priv) rte_free(priv); @@ -1050,20 +1031,17 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, claim_zero(ibv_close_device(ctx)); break; } - /* * XXX if something went wrong in the loop above, there is a resource * leak (ctx, pd, priv, dpdk ethdev) but we can do nothing about it as * long as the dpdk does not provide a way to deallocate a ethdev and a * way to enumerate the registered ethdevs to free the previous ones. */ - /* no port found, complain */ if (!mlx5_dev[idx].ports) { err = ENODEV; goto error; } - error: if (attr_ctx) claim_zero(ibv_close_device(attr_ctx)); diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 764549b63..79d62bbc1 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -411,7 +411,6 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) char ifname[IF_NAMESIZE]; info->pci_dev = RTE_ETH_DEV_TO_PCI(dev); - priv_lock(priv); /* FIXME: we should ask the device for these values. */ info->min_rx_bufsize = 32; @@ -517,7 +516,6 @@ mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev) int link_speed = 0; /* priv_lock() is not taken to allow concurrent calls. */ - if (priv_ifreq(priv, SIOCGIFFLAGS, &ifr)) { WARN("ioctl(SIOCGIFFLAGS) failed: %s", strerror(errno)); return -1; @@ -863,7 +861,6 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) strerror(ret)); goto out; } - fc_conf->autoneg = ethpause.autoneg; if (ethpause.rx_pause && ethpause.tx_pause) fc_conf->mode = RTE_FC_FULL; @@ -874,7 +871,6 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) else fc_conf->mode = RTE_FC_NONE; ret = 0; - out: priv_unlock(priv); assert(ret >= 0); @@ -915,7 +911,6 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) ethpause.tx_pause = 1; else ethpause.tx_pause = 0; - priv_lock(priv); if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { ret = errno; @@ -925,7 +920,6 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) goto out; } ret = 0; - out: priv_unlock(priv); assert(ret >= 0); @@ -1183,7 +1177,6 @@ priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev) rte_intr_callback_register(&priv->intr_handle, mlx5_dev_interrupt_handler, dev); } - rc = priv_socket_init(priv); if (!rc && priv->primary_socket) { priv->intr_handle_socket.fd = priv->primary_socket; diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c index 75de5a44d..7da54758c 100644 --- a/drivers/net/mlx5/mlx5_mr.c +++ b/drivers/net/mlx5/mlx5_mr.c @@ -105,7 +105,6 @@ mlx5_check_mempool(struct rte_mempool *mp, uintptr_t *start, rte_mempool_mem_iter(mp, mlx5_check_mempool_cb, &data); *start = (uintptr_t)data.start; *end = (uintptr_t)data.end; - return data.ret; } diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index f47bda667..8f0882c89 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -151,7 +151,6 @@ priv_rss_reta_index_resize(struct priv *priv, unsigned int reta_size) return ENOMEM; priv->reta_idx = mem; priv->reta_idx_n = reta_size; - if (old_size < reta_size) memset(&(*priv->reta_idx)[old_size], 0, (reta_size - old_size) * @@ -219,7 +218,6 @@ priv_dev_rss_reta_update(struct priv *priv, ret = priv_rss_reta_index_resize(priv, reta_size); if (ret) return ret; - for (idx = 0, i = 0; (i != reta_size); ++i) { idx = i / RTE_RETA_GROUP_SIZE; pos = i % RTE_RETA_GROUP_SIZE; diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 68b03d246..26eb30a40 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1009,7 +1009,6 @@ mlx5_priv_rxq_get(struct priv *priv, uint16_t idx) rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq); - mlx5_priv_rxq_ibv_get(priv, idx); rte_atomic32_inc(&rxq_ctrl->refcnt); DEBUG("%p: Rx queue %p: refcnt %d", (void *)priv, diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c index 198a69e3c..aa8b319d7 100644 --- a/drivers/net/mlx5/mlx5_vlan.c +++ b/drivers/net/mlx5/mlx5_vlan.c @@ -137,14 +137,12 @@ priv_vlan_strip_queue_set(struct priv *priv, uint16_t idx, int on) .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING, .flags = vlan_offloads, }; - err = ibv_modify_wq(rxq_ctrl->ibv->wq, &mod); if (err) { ERROR("%p: failed to modified stripping mode: %s", (void *)priv, strerror(err)); return; } - /* Update related bits in RX queue. */ rxq->vlan_strip = !!on; } @@ -169,13 +167,11 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) ERROR("VLAN stripping is not supported"); return; } - /* Validate queue number */ if (queue >= priv->rxqs_n) { ERROR("VLAN stripping, invalid queue number %d", queue); return; } - priv_lock(priv); priv_vlan_strip_queue_set(priv, queue, on); priv_unlock(priv); @@ -202,13 +198,11 @@ mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask) ERROR("VLAN stripping is not supported"); return 0; } - /* Run on every RX queue and set/reset VLAN stripping. */ priv_lock(priv); for (i = 0; (i != priv->rxqs_n); i++) priv_vlan_strip_queue_set(priv, i, hw_vlan_strip); priv_unlock(priv); } - return 0; } -- 2.11.0