Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe02e1cc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-phys_port_name' 



Florian Fainelli says:

====================
net: dsa: Implement ndo_get_phys_port_name()

This patch series implements ndo_get_phys_port_name() so we can revert
ndo_get_phys_id() which was (ab)used in the DSA layer.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9f91484f 592050b2

net/dsa/slave.c

+5 −5
Original line number Diff line number Diff line
@@ -983,13 +983,13 @@ static void dsa_slave_poll_controller(struct net_device *dev) 
}

#endif



static int dsa_slave_get_phys_port_id(struct net_device *dev,

				      struct netdev_phys_item_id *ppid)

static int dsa_slave_get_phys_port_name(struct net_device *dev,

					char *name, size_t len)

{

	struct dsa_slave_priv *p = netdev_priv(dev);



	ppid->id_len = sizeof(p->port);

	memcpy(ppid->id, &p->port, ppid->id_len);

	if (snprintf(name, len, "p%d", p->port) >= len)

		return -EINVAL;



	return 0;

}
@@ -1041,7 +1041,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = { 
	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_get_phys_port_id	= dsa_slave_get_phys_port_id,

	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,

};



static const struct switchdev_ops dsa_slave_switchdev_ops = {