From mboxrd@z Thu Jan 1 00:00:00 1970 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=Lw1ObaGRZVIwRbteD85k7Gwl8kStADmhJnDzv137zF8=; b=gJnJPReII0mbCpKJBpkl6pLM3CuRNnemrKaUs+ffVaHRu3TKyXWu4p4gEvoguqLzje dQnhfQZW1mNmsY8nO28DPkSYR72Uh1uawzCuEZnHpTH0c7gtBUrPCyRQnfmFwJI1/YnD v4GVMMtMUpRM9HUOh946Pkci5iQAxrhRj//oyO3ke3sz/2zEgdubYZ2DjE9BtaJ2K55a i5n5H+efkX8ommGGNSRnTnXhjiEmDa47oTjZAAjn4wjGikf4PZ+GT5h2A8sRa2PlBcSe YOYMpd4EhpTe9sa9URFKYxWiPJNVlSIMntf+dUPFI0uXm7RI/TlOqDiNs0r5Ed4kAOST Ay7w== From: Florian Fainelli Date: Mon, 4 Feb 2019 15:36:30 -0800 Message-Id: <20190204233633.20421-10-f.fainelli@gmail.com> In-Reply-To: <20190204233633.20421-1-f.fainelli@gmail.com> References: <20190204233633.20421-1-f.fainelli@gmail.com> Subject: [Bridge] [PATCH 09/12] netdevsim: 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: Andrew Lunn , Alexandre Belloni , Jakub Kicinski , John Hurley , "open list:NETRONOME ETHERNET DRIVERS" , Eric Dumazet , Ioana Ciornei , Tyler Hicks , Ivan Vecera , Florian Fainelli , Ioana Radulescu , "open list:MELLANOX MLX5 core VPI driver" , "moderated list:ETHERNET BRIDGE" , Amritha Nambiar , Saeed Mahameed , Dirk van der Merwe , Alexey Kuznetsov , Vivien Didelot , Alexander Duyck , "open list:STAGING SUBSYSTEM" , Daniel Borkmann , Nikolay Aleksandrov , Simon Horman , Roopa Prabhu , Satanand Burla , Ido Schimmel , Jiri Pirko , Kirill Tkhai , Edwin Peer , Michael Chan , Christian Brauner , Felix Manlunas , Leon Romanovsky , Nic Viljoen , Hideaki YOSHIFUJI , Greg Kroah-Hartman , Dmitry Torokhov , open list , Microchip Linux Driver Support , David Ahern , Joe Perches , Derek Chickles , "David S. Miller" netdevsim only supports SWITCHDEV_ATTR_ID_PORT_PARENT_ID, which makes it a great candidate to be converted to use the ndo_get_port_parent_id() NDO instead of implementing switchdev_port_attr_get(). Signed-off-by: Florian Fainelli --- drivers/net/netdevsim/netdev.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 8d8e2b3f263e..be47603234da 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -148,26 +148,16 @@ static struct device_type nsim_dev_type = { .release = nsim_dev_release, }; -static int -nsim_port_attr_get(struct net_device *dev, struct switchdev_attr *attr) +static int nsim_get_port_parent_id(struct net_device *dev, + struct netdev_phys_item_id *ppid) { struct netdevsim *ns = netdev_priv(dev); - switch (attr->id) { - case SWITCHDEV_ATTR_ID_PORT_PARENT_ID: - attr->u.ppid.id_len = sizeof(ns->sdev->switch_id); - memcpy(&attr->u.ppid.id, &ns->sdev->switch_id, - attr->u.ppid.id_len); - return 0; - default: - return -EOPNOTSUPP; - } + ppid->id_len = sizeof(ns->sdev->switch_id); + memcpy(&ppid->id, &ns->sdev->switch_id, ppid->id_len); + return 0; } -static const struct switchdev_ops nsim_switchdev_ops = { - .switchdev_port_attr_get = nsim_port_attr_get, -}; - static int nsim_init(struct net_device *dev) { char sdev_ddir_name[10], sdev_link_name[32]; @@ -214,7 +204,6 @@ static int nsim_init(struct net_device *dev) goto err_bpf_uninit; SET_NETDEV_DEV(dev, &ns->dev); - SWITCHDEV_SET_OPS(dev, &nsim_switchdev_ops); err = nsim_devlink_setup(ns); if (err) @@ -493,6 +482,7 @@ static const struct net_device_ops nsim_netdev_ops = { .ndo_setup_tc = nsim_setup_tc, .ndo_set_features = nsim_set_features, .ndo_bpf = nsim_bpf, + .ndo_get_port_paret_id = nsim_get_port_parent_id, }; static void nsim_setup(struct net_device *dev) -- 2.17.1