Skip to content

Commit

Permalink
Revert "net: dsa: Implement ndo_get_phys_port_id"
Browse files Browse the repository at this point in the history
This reverts commit 3a543ef ("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>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Jan 11, 2017
1 parent 44bb765 commit 592050b
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions net/dsa/slave.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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,
};

Expand Down

0 comments on commit 592050b

Please sign in to comment.