From patchwork Mon Feb 11 03:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1039581 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="JCNQe0XN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43yWh13W5Fz9sML for ; Mon, 11 Feb 2019 14:37:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbfBKDhe (ORCPT ); Sun, 10 Feb 2019 22:37:34 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:40120 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726102AbfBKDhd (ORCPT ); Sun, 10 Feb 2019 22:37:33 -0500 Received: by mail-qt1-f194.google.com with SMTP id j36so10665013qta.7 for ; Sun, 10 Feb 2019 19:37:33 -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=x28WkQ1sbKIF6R6iOa3CDfNNLtM9lwVkZpHyPH6SvQQ=; b=JCNQe0XNR7BFqU6ZiwKtGpSX8QaBCarUhrb54wbe9uPPEI0a1wGdjgisf25vSdJrEl TrzHREBRw7Bo4TmdCMzR0y8vWR+E/VJEjak1FiUcyLuqvvhfzxzUVS7ih+aq3ByicGyU Kk/yO946jGSStWH3yEFEt1lrj7eYyR7TyNWZCi2Uc8/20tjas3BSgOA9VG7lQrE7+yGY YYfjfzq7d8YKSLQTN/9MUH42l2ePUHbaCH8Aj9BxE1M6p5ms0wopLuFbmrTTTlruVw6e aWpSyx2dnu2HRon+5yuc8IhkA2agAJCcQ1Lll9siaEWTtwBOg1HRScAZtOsF+WTbnUJ1 i5Ww== 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=x28WkQ1sbKIF6R6iOa3CDfNNLtM9lwVkZpHyPH6SvQQ=; b=MkH0D+saiDrm5VXguFoNrJRDkkJ4UAPiqRxutMRyJgd2SDebVnhoBQ29oAm5sppPeS WDV47yVf80oSpRfHqMVbCQIUf18kHEaCE1ND/Ar6yvgNSIl0k+jOUylwW1OpVIPaERvH QXNgLW4IxCNufgXld322Eb2qiunsu4zsfTKncu14sIMYta2SAtMz/qFpK+FXRsyhOtMz t+5TmOXZDCpxP0sUpMKPsVkmtR4fV+c6uhiVP4GGM9MiHY6etjNeKRgXqHHn2/Wvsa7L TlmNJdeQSlCLFgLGvcRpGvSE5PQaR38allZiZ9o700mCUDrcHTFqLC+hNDBt8T4XCaZh A3/g== X-Gm-Message-State: AHQUAuaq4TAXJ2mhTu6JkKkxhszuq/wWJqx1H5XClVIki21gxGKbR70P qu5RV2zoKeVpApaCsu8E7HYDFQ== X-Google-Smtp-Source: AHgI3IYcniXEAoWagSfVVcle3JsH1tjqNSdmQj8HsMYahOG2w86DgdyXHctnTSukc3Sjn9CCbE7akA== X-Received: by 2002:a05:6214:18e:: with SMTP id q14mr25149083qvr.173.1549856252771; Sun, 10 Feb 2019 19:37:32 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id d63sm24689266qka.22.2019.02.10.19.37.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 19:37:31 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 1/5] devlink: fix condition for compat device info Date: Sun, 10 Feb 2019 19:35:27 -0800 Message-Id: <20190211033531.12928-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190211033531.12928-1-jakub.kicinski@netronome.com> References: <20190211033531.12928-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 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 Acked-by: Jiri Pirko --- 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);