From patchwork Mon Apr 1 09:40:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 1072555 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="oq++ST2h"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44XnQL6Hrjz9sQw for ; Mon, 1 Apr 2019 20:40:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726845AbfDAJkl (ORCPT ); Mon, 1 Apr 2019 05:40:41 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45944 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726818AbfDAJkk (ORCPT ); Mon, 1 Apr 2019 05:40:40 -0400 Received: by mail-wr1-f68.google.com with SMTP id s15so11043078wra.12 for ; Mon, 01 Apr 2019 02:40:39 -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=G+sS4femnY6EkK277GFiaZikjEU5ukC5bAExRE6sCTk=; b=oq++ST2hPZb2NUwit++4d0THwMZRd4hr+emhq0uBEw/x01jriDxzfw0GZNgtGakhwH 83wV5BvuoNxbCanHb7gQUG05N4+ndwLmxc+RzPxmjWKztaq/JfCv4yP0k9g1ElzRmXch Pd4RuJScEBaQ4zvISnw6yUVjcORJiCflZ+7grIFfKMqVMQsjIZpCDlngsFJ+yf2YVGEQ 4HLObtdjjx3GnbrqVvTWiKmU/JhqN/dDYhcQYqlfT5zTKnBPO1w0vmozi9V7Rz/YE0dD l9THQqtgnDpdyaZ+iER4y3ocugh5bXNop/LRmyeL2X502Ss8UXXm7VCnjyF/Wbr2e6As kUUA== 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=G+sS4femnY6EkK277GFiaZikjEU5ukC5bAExRE6sCTk=; b=s68+wgQ96hegUhbmssVdsFSbJT7cV7EkC1S0GaaR2KBVDmtGrBCsFyoA5or2yMFNfh CdYiH9TTW+lrbAa/lZvWiiXNKddvtSmPyqC5nyegbWTX172KIGBRBxmcOZXCOe3iqpr2 J9J7a+31BkgwZ618WXJWICa9ehUkPXWq2hYJtuzLmxNQClqkI0CfedSdhQhlX6pAGnwn IB+PsXPYWJCxPQ8rAbc8rY2zrGJvhs4jj3kMHf9V7P/KExcSFl04Q+FLi0uLaCMy96do EdLzgw+nrDrp2BJ6CUSIyrYGgHBm+xdnfgjZgXq9TH02PTcwOwX76EpDJL5XEM/9zf7G pC6A== X-Gm-Message-State: APjAAAUHcvcF3zSAJ7nPFSSVjshozu8xnhObDLmRPlrJJv++xF7VIr0Y X2Ib++7uquOOxz9GtYPyoGQRoIqOcrU= X-Google-Smtp-Source: APXvYqyC7026dIefR1rZHsYJptsKKR4HPWghuA4wzpP4Zp0wwrb2hsW9j7AU0ehr9LX5FtDmzDQu/Q== X-Received: by 2002:adf:e510:: with SMTP id j16mr38199983wrm.259.1554111638398; Mon, 01 Apr 2019 02:40:38 -0700 (PDT) Received: from localhost (mail.chocen-mesto.cz. [85.163.43.2]) by smtp.gmail.com with ESMTPSA id y17sm847873wma.8.2019.04.01.02.40.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Apr 2019 02:40:38 -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 v2 11/12] dsa: pass switch ID through devlink_port_attrs_set() Date: Mon, 1 Apr 2019 11:40:25 +0200 Message-Id: <20190401094026.3676-12-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190401094026.3676-1-jiri@resnulli.us> References: <20190401094026.3676-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Pass the switch ID down the to devlink through devlink_port_attrs_set() so it can be used by devlink_compat_switch_id_get(). Leave ndo_get_port_parent_id implementation only for legacy. Signed-off-by: Jiri Pirko --- net/dsa/dsa2.c | 4 +++- net/dsa/slave.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 514be0583642..410cb0da9def 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -260,6 +260,7 @@ static int dsa_port_setup(struct dsa_port *dp) { enum devlink_port_flavour flavour; struct dsa_switch *ds = dp->ds; + struct dsa_switch_tree *dst = ds->dst; int err; if (dp->type == DSA_PORT_TYPE_UNUSED) @@ -285,7 +286,8 @@ static int dsa_port_setup(struct dsa_port *dp) * independent from front panel port numbers. */ devlink_port_attrs_set(&dp->devlink_port, flavour, - dp->index, false, 0, NULL, 0); + dp->index, false, 0, + (const char *) &dst->index, sizeof(dst->index)); err = devlink_port_register(ds->devlink, &dp->devlink_port, dp->index); if (err) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 80be8e86c82d..026a4003d520 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1130,7 +1130,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, .ndo_setup_tc = dsa_slave_setup_tc, .ndo_get_stats64 = dsa_slave_get_stats64, - .ndo_get_port_parent_id = dsa_slave_get_port_parent_id, .ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, .ndo_get_devlink_port = dsa_slave_get_devlink_port,