summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2017-09-19 18:56:57 +0300
committerDavid S. Miller <davem@davemloft.net>2017-09-20 02:04:22 +0300
commitf5619866592c65adc087364cc1a3ba709201ea26 (patch)
treeec738ec423be6543161bb9a81accb6a075b75fc8 /include/net
parent69e33b2754ea4fbe4fdd2d18bc8ca05d8670a5c2 (diff)
downloadlinux-f5619866592c65adc087364cc1a3ba709201ea26.tar.xz
net: dsa: remove copy of master ethtool_ops
There is no need to store a copy of the master ethtool ops, storing the original pointer in DSA and the new one in the master netdev itself is enough. In the meantime, set orig_ethtool_ops to NULL when restoring the master ethtool ops and check the presence of the master original ethtool ops as well as its needed functions before calling them. 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 'include/net')
-rw-r--r--include/net/dsa.h1
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;
};