diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-04-02 17:07:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-02 14:05:01 -0400 |
| commit | abd2be00d474956c542a1c2ec848af7196b7fd51 (patch) | |
| tree | 81f7dca2a8b7c7e71b12388d00109b1af8085057 /net/dsa | |
| parent | 5aa7add8f14bc29105bca841c053f574c8d232dd (diff) | |
| download | op-kernel-dev-abd2be00d474956c542a1c2ec848af7196b7fd51.zip op-kernel-dev-abd2be00d474956c542a1c2ec848af7196b7fd51.tar.gz | |
dsa: implement ndo_get_iflink
Don't use dev->iflink anymore.
CC: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 3597724..827cda56 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -55,13 +55,11 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds) /* slave device handling ****************************************************/ -static int dsa_slave_init(struct net_device *dev) +static int dsa_slave_get_iflink(const struct net_device *dev) { struct dsa_slave_priv *p = netdev_priv(dev); - dev->iflink = p->parent->dst->master_netdev->ifindex; - - return 0; + return p->parent->dst->master_netdev->ifindex; } 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 = { }; static const struct net_device_ops dsa_slave_netdev_ops = { - .ndo_init = dsa_slave_init, .ndo_open = dsa_slave_open, .ndo_stop = dsa_slave_close, .ndo_start_xmit = dsa_slave_xmit, @@ -675,6 +672,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_fdb_del = dsa_slave_fdb_del, .ndo_fdb_dump = dsa_slave_fdb_dump, .ndo_do_ioctl = dsa_slave_ioctl, + .ndo_get_iflink = dsa_slave_get_iflink, }; static const struct swdev_ops dsa_slave_swdev_ops = { |
