Return-Path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+GrH69au9gNQJGXuWwx46YWKRJ0rC1zNpRUoiH8JEA4=; b=mH/I0/FTVmaBOJ56stSNijt753HM1P5K32MSxws2XV+PXky44hXvg+H7zfFENjVjK7 dnFNYbxBLh7ljNNa8c1a9sN4Rqtj7dhfDeuc854NP1RwgD2nfbZnwDyd0HbZ9CgJDOlE CDTMHVzUUuAtoQwdqfOQsGeszhfC1V1o3u7ATF8G4vU0Ov0NxzRUvA25XUpUGYtVwFlj uBDDqlUASrRncErhykv6cflnklc4cudgVDcc1cZl6t4+VfzKx802eMR2JqCyPv7EjLB9 d69ToLuXfV8k7EuvkcpdCl1impfBIbGq4hGHbrgX1ar32gxrpYK8mEwHmtkQuq2OsYCP YEag== From: Florian Fainelli Date: Tue, 5 Feb 2019 14:13:10 -0800 Message-Id: <20190205221311.18476-12-f.fainelli@gmail.com> In-Reply-To: <20190205221311.18476-1-f.fainelli@gmail.com> References: <20190205221311.18476-1-f.fainelli@gmail.com> Subject: [Bridge] [PATCH net-next v2 11/12] net: dsa: Implement ndo_get_port_parent_id() List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: netdev@vger.kernel.org Cc: "open list:STAGING SUBSYSTEM" , Florian Fainelli , "open list:MELLANOX MLX5 core VPI driver" , "moderated list:ETHERNET BRIDGE" , open list , Ido Schimmel , "open list:NETRONOME ETHERNET DRIVERS" , "David S. Miller" DSA implements SWITCHDEV_ATTR_ID_PORT_PARENT_ID and we want to get rid of switchdev_ops eventually, ease that migration by implementing a ndo_get_port_parent_id() function which returns what switchdev_port_attr_get() would do. Signed-off-by: Florian Fainelli --- net/dsa/slave.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 91de3a663226..70395a0ae52e 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -362,18 +362,23 @@ static int dsa_slave_port_obj_del(struct net_device *dev, return err; } -static int dsa_slave_port_attr_get(struct net_device *dev, - struct switchdev_attr *attr) +static int dsa_slave_get_port_parent_id(struct net_device *dev, + struct netdev_phys_item_id *ppid) { struct dsa_port *dp = dsa_slave_to_port(dev); struct dsa_switch *ds = dp->ds; struct dsa_switch_tree *dst = ds->dst; + ppid->id_len = sizeof(dst->index); + memcpy(&ppid->id, &dst->index, ppid->id_len); + + return 0; +} + +static int dsa_slave_port_attr_get(struct net_device *dev, + struct switchdev_attr *attr) +{ switch (attr->id) { - case SWITCHDEV_ATTR_ID_PORT_PARENT_ID: - attr->u.ppid.id_len = sizeof(dst->index); - memcpy(&attr->u.ppid.id, &dst->index, attr->u.ppid.id_len); - break; case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT: attr->u.brport_flags_support = 0; break; @@ -1046,6 +1051,7 @@ 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, }; static const struct switchdev_ops dsa_slave_switchdev_ops = { -- 2.17.1