diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-20 02:04:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-20 02:04:23 +0300 |
| commit | d43a9d19803d139901891f5e9d814ef3eae54641 (patch) | |
| tree | 1186ff809f74031be7a52681aa0cb9f2be03221f /include | |
| parent | 69e33b2754ea4fbe4fdd2d18bc8ca05d8670a5c2 (diff) | |
| parent | f2f2356685bcaf1063859356fc65a5ac808b1382 (diff) | |
| download | linux-d43a9d19803d139901891f5e9d814ef3eae54641.tar.xz | |
Merge branch 'dsa-master-ethtool-move'
Vivien Didelot says:
====================
net: dsa: move master ethtool code
The DSA core overrides the master device's ethtool_ops structure so that
it can inject statistics and such of its dedicated switch CPU port.
This ethtool code is currently called on unnecessary conditions or
before the master interface and its switch CPU port get wired up.
This patchset fixes this.
Similarly to slave.c where the DSA slave net_device is the entry point
of the dsa_slave_* functions, this patchset also isolates the master's
ethtool code in a new master.c file, where the DSA master net_device is
the entry point of the dsa_master_* functions.
This is a first step towards better control of the master device and
support for multiple CPU ports.
====================
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index dd44d6ce1097..8dee216a5a9b 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -188,7 +188,6 @@ struct dsa_port { /* * Original copy of the master netdev ethtool_ops */ - struct ethtool_ops ethtool_ops; const struct ethtool_ops *orig_ethtool_ops; }; |