hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "net: dsa: Implement ndo_get_phys_port_id" 

This reverts commit 3a543ef479 ("net: dsa:
Implement ndo_get_phys_port_id") since it misuses the purpose of
ndo_get_phys_port_id(). We have ndo_get_phys_port_name() to do the
correct thing for us now.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-01-10 12:32:37 -08:00 committed by David S. Miller
parent 44bb765cf0
commit 592050b254
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/dsa/slave.c
View File

@ -983,15 +983,6 @@ static void dsa_slave_poll_controller(struct net_device *dev)
} }
#endif #endif
static int dsa_slave_get_phys_port_id(struct net_device *dev,
struct netdev_phys_item_id *ppid)
{
struct dsa_slave_priv *p = netdev_priv(dev);
ppid->id_len = sizeof(p->port);
memcpy(ppid->id, &p->port, ppid->id_len);
}
static int dsa_slave_get_phys_port_name(struct net_device *dev, static int dsa_slave_get_phys_port_name(struct net_device *dev,
char *name, size_t len) char *name, size_t len)
{ {
@ -1050,7 +1041,6 @@ 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, .ndo_get_phys_port_name = dsa_slave_get_phys_port_name,
}; };