openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-01-11 09:55:55 -05:00
parent 9f91484f6f 592050b254
commit fe02e1ccaf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/dsa/slave.c
View File

@ -983,13 +983,13 @@ static void dsa_slave_poll_controller(struct net_device *dev)
} }
#endif #endif
static int dsa_slave_get_phys_port_id(struct net_device *dev, static int dsa_slave_get_phys_port_name(struct net_device *dev,
struct netdev_phys_item_id *ppid) char *name, size_t len)
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
ppid->id_len = sizeof(p->port); if (snprintf(name, len, "p%d", p->port) >= len)
memcpy(ppid->id, &p->port, ppid->id_len); return -EINVAL;
return 0; 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_getlink = switchdev_port_bridge_getlink,
.ndo_bridge_setlink = switchdev_port_bridge_setlink, .ndo_bridge_setlink = switchdev_port_bridge_setlink,
.ndo_bridge_dellink = switchdev_port_bridge_dellink, .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 = { static const struct switchdev_ops dsa_slave_switchdev_ops = {