From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by dpdk.org (Postfix) with ESMTP id 45C402C74 for ; Tue, 28 Mar 2017 16:13:27 +0200 (CEST) Received: by mail-wr0-f178.google.com with SMTP id u1so107434627wra.2 for ; Tue, 28 Mar 2017 07:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FEeU69oNeEHRUGtwxLFdGZp4B5zsCqovkeQU3FF4YXw=; b=03YIxmiXGpGSMY9xdEZn+B1af0gTZNSBr0QHJJK0TpDrP0nQyTJ6Ne2/aSRwKsbBwI bDe9dXN11PO6u0D50b8aXLSAAy+MI9x40IuuKpWvlZAnzNW9mK+BYnhaRob5+nm/duq6 HhNlwJsQwDKfT1iCqZUiLNBldXDiEfDZ3pj+8/CjN2EhIPQ+8qKoaWJRB0MmF7fOi3ci CMMUOxnyLcCQ2BTL+Ou/qcA6jAc4YRARwiZsB9vqzt/9nWb+3bxoa4QKUg7xMzGYb8mL Xrr7Td43xU6paiiWWmiJWsWaUzXJ83meVSAw8Qqkl09DsSsozQhVLxdNVIXldQJ1Crw4 JMJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FEeU69oNeEHRUGtwxLFdGZp4B5zsCqovkeQU3FF4YXw=; b=ASLngKI5stIZnIZK2/vrNzS8ZjcAhiAImJU3WGweFhJ/zz8pJ6sKg0GiYt8yDYHVqW xeFXHY4UIFA4WYNr5CquX+i6DNGRH0jWGHvP6ldUEtxpByehr1Fo6VsgElV3WYYUIKPn DjH50/raFPPQXefmMJ007zMTotbZbH/GlsJdtZayZeqv+KWSAXJXGBWffx9mgVBGI2Oj qdL3IPvJYAk9ursgI2lnPWvPLktAD3i+OhgXQ/utC9YauYd/HUfMA4S+belizRI2Zqf4 sj1SJhm3m4Y0guiR5tnVV1ny9zWM0jMik5ce5SBC5yYamUYM48cyOG0T4wwNwrBQHyYE LgKw== X-Gm-Message-State: AFeK/H3WRi4kQ81SswYcty5YyPazPBi0hqviZnxe7BPq7F40UfvJ6dmtUBwtDNgXAwnVuJjh X-Received: by 10.223.162.212 with SMTP id t20mr24535581wra.122.1490710406966; Tue, 28 Mar 2017 07:13:26 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id m83sm2287841wmc.7.2017.03.28.07.13.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Mar 2017 07:13:26 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Adrien Mazarguil , Nelio Laranjeiro , stable@dpdk.org Date: Tue, 28 Mar 2017 16:13:11 +0200 Message-Id: <07af53e20549d11c6a83973d2c413a9761d20bc3.1490710280.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <2f6db539fb06934a9433fea1e3ea64d5171db962.1490624067.git.gaetan.rivet@6wind.com> References: <2f6db539fb06934a9433fea1e3ea64d5171db962.1490624067.git.gaetan.rivet@6wind.com> Subject: [dpdk-stable] [PATCH v2 1/2] net/mlx4: fix returned values upon failed probing 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, 28 Mar 2017 14:13:27 -0000 Let error messages in place, but return unambiguous values upon probing errors. Fixes: 66e1591687ac ("mlx4: avoid init errors when kernel modules are not loaded") Cc: stable@dpdk.org Signed-off-by: Gaetan Rivet Acked-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 4427ca3..350b2f4 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5521,10 +5521,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) list = ibv_get_device_list(&i); if (list == NULL) { assert(errno); - if (errno == ENOSYS) { - WARN("cannot list devices, is ib_uverbs loaded?"); - return 0; - } + if (errno == ENOSYS) + ERROR("cannot list devices, is ib_uverbs loaded?"); return -errno; } assert(i >= 0); @@ -5556,11 +5554,11 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) ibv_free_device_list(list); switch (err) { case 0: - WARN("cannot access device, is mlx4_ib loaded?"); - return 0; + ERROR("cannot access device, is mlx4_ib loaded?"); + return -ENODEV; case EINVAL: - WARN("cannot use device, are drivers up to date?"); - return 0; + ERROR("cannot use device, are drivers up to date?"); + return -EINVAL; } assert(err > 0); return -err; -- 2.1.4