Skip to content

Commit abd2be0

Browse files
NicolasDichteldavem330
authored andcommitted
dsa: implement ndo_get_iflink
Don't use dev->iflink anymore. CC: Florian Fainelli <[email protected]> Signed-off-by: Nicolas Dichtel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5aa7add commit abd2be0

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

net/dsa/slave.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,11 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds)
5555

5656

5757
/* slave device handling ****************************************************/
58-
static int dsa_slave_init(struct net_device *dev)
58+
static int dsa_slave_get_iflink(const struct net_device *dev)
5959
{
6060
struct dsa_slave_priv *p = netdev_priv(dev);
6161

62-
dev->iflink = p->parent->dst->master_netdev->ifindex;
63-
64-
return 0;
62+
return p->parent->dst->master_netdev->ifindex;
6563
}
6664

6765
static inline bool dsa_port_is_bridged(struct dsa_slave_priv *p)
@@ -664,7 +662,6 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
664662
};
665663

666664
static const struct net_device_ops dsa_slave_netdev_ops = {
667-
.ndo_init = dsa_slave_init,
668665
.ndo_open = dsa_slave_open,
669666
.ndo_stop = dsa_slave_close,
670667
.ndo_start_xmit = dsa_slave_xmit,
@@ -675,6 +672,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
675672
.ndo_fdb_del = dsa_slave_fdb_del,
676673
.ndo_fdb_dump = dsa_slave_fdb_dump,
677674
.ndo_do_ioctl = dsa_slave_ioctl,
675+
.ndo_get_iflink = dsa_slave_get_iflink,
678676
};
679677

680678
static const struct swdev_ops dsa_slave_swdev_ops = {

0 commit comments

Comments
 (0)