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

Commit 592050b2 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

Revert "net: dsa: Implement ndo_get_phys_port_id" 



This reverts commit 3a543ef4 ("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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44bb765c

net/dsa/slave.c

+0 −10
Original line number Diff line number Diff line
@@ -983,15 +983,6 @@ 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)

{

	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,

					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_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,

};