diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-09-19 11:57:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-19 16:04:23 -0700 |
| commit | f2f2356685bcaf1063859356fc65a5ac808b1382 (patch) | |
| tree | 1186ff809f74031be7a52681aa0cb9f2be03221f /net/dsa/legacy.c | |
| parent | 1943563dfd4b3a1f9dc102f056813112d29bb60f (diff) | |
| download | linux-stable-f2f2356685bcaf1063859356fc65a5ac808b1382.tar.gz linux-stable-f2f2356685bcaf1063859356fc65a5ac808b1382.tar.bz2 linux-stable-f2f2356685bcaf1063859356fc65a5ac808b1382.zip | |
net: dsa: move master ethtool code
DSA overrides the master device ethtool ops, so that it can inject stats
from its dedicated switch CPU port as well.
The related code is currently split in dsa.c and slave.c, but it only
scopes the master net device. Move it to a new master.c DSA core file.
This file will be later extented with master net device specific code.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/legacy.c')
| -rw-r--r-- | net/dsa/legacy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c index 163910699db7..ae505d8e4417 100644 --- a/net/dsa/legacy.c +++ b/net/dsa/legacy.c @@ -602,7 +602,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev, wmb(); dev->dsa_ptr = dst; - return dsa_cpu_port_ethtool_setup(dst->cpu_dp); + return dsa_master_ethtool_setup(dst->cpu_dp->netdev); } static int dsa_probe(struct platform_device *pdev) @@ -667,7 +667,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) { int i; - dsa_cpu_port_ethtool_restore(dst->cpu_dp); + dsa_master_ethtool_restore(dst->cpu_dp->netdev); dst->cpu_dp->netdev->dsa_ptr = NULL; |