From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1B1AC282CB for ; Sat, 9 Feb 2019 03:16:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F007217D8 for ; Sat, 9 Feb 2019 03:16:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="1aC1qCsV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726914AbfBIDQy (ORCPT ); Fri, 8 Feb 2019 22:16:54 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:38105 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726663AbfBIDQx (ORCPT ); Fri, 8 Feb 2019 22:16:53 -0500 Received: by mail-qt1-f193.google.com with SMTP id 2so6324120qtb.5 for ; Fri, 08 Feb 2019 19:16:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7NYu9dC3XG7Tp8dq9pFMZG0XPF1Hh/lOk0/6ZSpy2pw=; b=1aC1qCsVqRnuwziyqSTjjAyQxN+kzetaUSgFn/zc52i4YFr5taPZqaWgQ1kO6ZOeH7 LiqH+hnJGMfrsk7xxj7s/3ar3gfqvXgltT7HppE2dweKNvXvOAnPzkSat6BGt4a9hVhj iIKRlVf7Qd+5XPvMuwsvEjNfqloWVgCadQO/QmXOWomxZGKwtkD53IoInT8BS2VGeQE/ WeTypGTdCIbrGvyVXgHkB139ndoZyxCwNm0zd03eIIOcjgZ9jsrmJqOnZ5GO5r3gA28B 0vywIQ3SV4ZQWJSwdhDWQwqd9CDRKO6VS/ua55ZElP/IXs+VLR4WVfuSKGodTdViyl+Z 5gCg== 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:mime-version:content-transfer-encoding; bh=7NYu9dC3XG7Tp8dq9pFMZG0XPF1Hh/lOk0/6ZSpy2pw=; b=TMwuRF4dTBUBBonVkkwzFi4hEV0KmOnebexWETwBivGlZ7H+oi3GM7LDCB/9yxvX8X qAkvDBKuQQVc4iSM7Sss5Gh6FFALWBsUH57qWxGj37lRgkMbFrISOBwpMFnb6DbhCz88 Kp5K+YGW+eo6MLMxq1CEbxn6E7ejtWl3mBfEzPFeSOATuMv3p+JXxy+jjjx0dsbfvjZC 9fFMp8ofxp1YoFUHBgc70LZSKQlNcLjE8YHY+v+qrl63bbbvJFmiEd7BVwBfcES2EjjO sqgWWkL5C1yYnhIEWRRqzEZn0VOsH66/oyYjBnbX47pcfFywGXzAmQaqDsBl/Dlu1QGr AKkQ== X-Gm-Message-State: AHQUAuac4MHhbMpBByARwytWstbYWtD11/qRv95xwvZT3ayiqZA5gc6w BbvN8ZKYOy17jK/xVVrLMHyQDhNDpVA= X-Google-Smtp-Source: AHgI3Ib65nhMF6tN/xFY9BiaqAPaGZq6AcTpRcjfyFSSLT7wxKhWGTnoaQQGZqsk0MyvELDpSAW2pA== X-Received: by 2002:ac8:110f:: with SMTP id c15mr19106702qtj.355.1549682212496; Fri, 08 Feb 2019 19:16:52 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i28sm3185212qkk.41.2019.02.08.19.16.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 19:16:52 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 1/4] devlink: fix condition for compat device info Date: Fri, 8 Feb 2019 19:16:08 -0800 Message-Id: <20190209031611.1102-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190209031611.1102-1-jakub.kicinski@netronome.com> References: <20190209031611.1102-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need the port to be both ethernet and have the rigth netdev, not one or the other. Fixes: ddb6e99e2db1 ("ethtool: add compat for devlink info") Signed-off-by: Jakub Kicinski --- net/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index e6a015b8ac9b..cf0f511bc56c 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6385,7 +6385,7 @@ void devlink_compat_running_version(struct net_device *dev, list_for_each_entry(devlink, &devlink_list, list) { mutex_lock(&devlink->lock); list_for_each_entry(devlink_port, &devlink->port_list, list) { - if (devlink_port->type == DEVLINK_PORT_TYPE_ETH || + if (devlink_port->type == DEVLINK_PORT_TYPE_ETH && devlink_port->type_dev == dev) { __devlink_compat_running_version(devlink, buf, len); -- 2.19.2