summaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorVivien Didelot2017-08-01 22:32:41 +0200
committerDavid S. Miller2017-08-02 05:09:10 +0200
commit08f500610f39809c107f206cba1f799c98c38054 (patch)
treebe8bd07ce67de1a8b7de2c42dfde421579c3b2ba /net/dsa
parentnet: dsa: mv88e6xxx: remove EEE support (diff)
downloadkernel-qcow2-linux-08f500610f39809c107f206cba1f799c98c38054.tar.gz
kernel-qcow2-linux-08f500610f39809c107f206cba1f799c98c38054.tar.xz
kernel-qcow2-linux-08f500610f39809c107f206cba1f799c98c38054.zip
net: dsa: rename switch EEE ops
To avoid confusion with the PHY EEE settings, rename the .set_eee and .get_eee ops to respectively .set_mac_eee and .get_mac_eee. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/slave.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 9ddc584e70b0..cc4bad3dadb4 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -652,10 +652,10 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e)
if (!p->phy)
return -ENODEV;
- if (!ds->ops->set_eee)
+ if (!ds->ops->set_mac_eee)
return -EOPNOTSUPP;
- ret = ds->ops->set_eee(ds, p->dp->index, e);
+ ret = ds->ops->set_mac_eee(ds, p->dp->index, e);
if (ret)
return ret;
@@ -678,10 +678,10 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e)
if (!p->phy)
return -ENODEV;
- if (!ds->ops->get_eee)
+ if (!ds->ops->get_mac_eee)
return -EOPNOTSUPP;
- ret = ds->ops->get_eee(ds, p->dp->index, e);
+ ret = ds->ops->get_mac_eee(ds, p->dp->index, e);
if (ret)
return ret;