From patchwork Thu Mar 28 12:56:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1068143 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=resnulli.us Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="TexkGwLB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44VPyp1Lz4z9sP9 for ; Thu, 28 Mar 2019 23:57:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727008AbfC1M5E (ORCPT ); Thu, 28 Mar 2019 08:57:04 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35138 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726332AbfC1M5B (ORCPT ); Thu, 28 Mar 2019 08:57:01 -0400 Received: by mail-wm1-f66.google.com with SMTP id y197so1192876wmd.0 for ; Thu, 28 Mar 2019 05:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RcQSlXh2mVQ8KAfpaWx1bsYf/d2xVQLiDmkJVaTz8RM=; b=TexkGwLBRvrxUwMyZBTrgvx9qnP7DrGQI4QfOR/gXD2f38EwAZkLHbrJnLB3sOxGGX 9XqQR40lO9bz/78ioPQ7ujnZsPKO3Eby4v7uu1CNuhRaC4BgfCYpHl75t1nd3ma3+h8T jDqlJsNJp1kVjFTvqSJP6pCcBUoh5kCjANon00zhlZi0blU5jy86GvrDmGFGNuiqihQU gr9z0k42Y+sIW0mJm2HNRQHyCE7z/4+xkLb5wZoo20b16+939SrPCYsFXHo0nzvlI0tY jQqpQUsZl4QRXDF2R/E52LHlurMY5Eum8DP7oJU86mxESQwc7m8/8DzujdLpNIAooEvJ 1ZFQ== 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=RcQSlXh2mVQ8KAfpaWx1bsYf/d2xVQLiDmkJVaTz8RM=; b=CMYY1hGVQUZWmPnf0YWqB8j3CIZNJA7aN5jcTysr9xyRCR+WzCQuBPObvFxjqyo3zD bBBiISIx+X75q5CUoDHZnnXCU8Jf2Taaotv047kRUlc7r36Ptb305EKXF8Zs1gQJ5o59 gLZlYRVvmpGSg5c6GiBZEIZwHXmRfJdkmUkIeW+0sS3LHBzWxX4jubr+cDm9q+wegLBl TQiGzA9jYDfIx7ixw4dU5rvaxQr57xGABHlFsiC1nv4atbtGaopWs/zHeIMLb9D3ZaBo 5MmGqmso1hAaqG9bZqYUH6imiOkzrsAVOtix1wv7fOdMShkb5oZsvLJngHokS5Ch1bwr +kbw== X-Gm-Message-State: APjAAAXo0nQ0niViydbbyXkP6lLlTsVbbkMtWcaZK+ywOX/CN4MobzSJ 0IOkKvit81uOeb2qYQ+ffTNWWQsSUb0= X-Google-Smtp-Source: APXvYqwjBf17AaK7kPZaFmzHwGu3vcZYC2k5e1n9GnK6WNVslVsTcju6re0ckIoJttOflMSrms0t3w== X-Received: by 2002:a1c:3104:: with SMTP id x4mr12171865wmx.23.1553777819277; Thu, 28 Mar 2019 05:56:59 -0700 (PDT) Received: from localhost (ip-94-113-223-73.net.upcbroadband.cz. [94.113.223.73]) by smtp.gmail.com with ESMTPSA id y1sm58706250wrd.34.2019.03.28.05.56.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Mar 2019 05:56:58 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com Subject: [patch net-next v4 11/12] nfp: do not handle nn->port defined case in nfp_net_get_phys_port_name() Date: Thu, 28 Mar 2019 13:56:45 +0100 Message-Id: <20190328125646.872-12-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190328125646.872-1-jiri@resnulli.us> References: <20190328125646.872-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko If nn->port is defined it means that devlink_port has been registered for this port as well. Devlink core is handling the port name formatting. Signed-off-by: Jiri Pirko Reviewed-by: Jakub Kicinski --- v1->v2: - new patch --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index b676943e54f4..99200b5dac76 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3324,8 +3324,11 @@ nfp_net_get_phys_port_name(struct net_device *netdev, char *name, size_t len) struct nfp_net *nn = netdev_priv(netdev); int n; + /* If port is defined, devlink_port is registered and devlink core + * is taking care of name formatting. + */ if (nn->port) - return nfp_port_get_phys_port_name(netdev, name, len); + return -EOPNOTSUPP; if (nn->dp.is_vf || nn->vnic_no_name) return -EOPNOTSUPP;