diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-01-10 15:32:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-11 09:55:54 -0500 |
commit | 592050b2541407d033da18226d3644644832d082 (patch) | |
tree | 1542cf5e37bead38173a2e17b7fa26072c6be706 /net/dsa/slave.c | |
parent | 44bb765cf07ab6622e6fdf4bce546b43bd20faee (diff) |
Revert "net: dsa: Implement ndo_get_phys_port_id"
This reverts commit 3a543ef479868e36c95935de320608a7e41466ca ("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>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r-- | net/dsa/slave.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index fed3fbd403cb..0cdcaf526987 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
@@ -983,15 +983,6 @@ static void dsa_slave_poll_controller(struct net_device *dev) | |||
983 | } | 983 | } |
984 | #endif | 984 | #endif |
985 | 985 | ||
986 | static int dsa_slave_get_phys_port_id(struct net_device *dev, | ||
987 | struct netdev_phys_item_id *ppid) | ||
988 | { | ||
989 | struct dsa_slave_priv *p = netdev_priv(dev); | ||
990 | |||
991 | ppid->id_len = sizeof(p->port); | ||
992 | memcpy(ppid->id, &p->port, ppid->id_len); | ||
993 | } | ||
994 | |||
995 | static int dsa_slave_get_phys_port_name(struct net_device *dev, | 986 | static int dsa_slave_get_phys_port_name(struct net_device *dev, |
996 | char *name, size_t len) | 987 | char *name, size_t len) |
997 | { | 988 | { |
@@ -1050,7 +1041,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { | |||
1050 | .ndo_bridge_getlink = switchdev_port_bridge_getlink, | 1041 | .ndo_bridge_getlink = switchdev_port_bridge_getlink, |
1051 | .ndo_bridge_setlink = switchdev_port_bridge_setlink, | 1042 | .ndo_bridge_setlink = switchdev_port_bridge_setlink, |
1052 | .ndo_bridge_dellink = switchdev_port_bridge_dellink, | 1043 | .ndo_bridge_dellink = switchdev_port_bridge_dellink, |
1053 | .ndo_get_phys_port_id = dsa_slave_get_phys_port_id, | ||
1054 | .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, | 1044 | .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, |
1055 | }; | 1045 | }; |
1056 | 1046 | ||