Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1be52e97 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

dsa: slave: eee: Allow ports to use phylink 



For a port to be able to use EEE, both the MAC and the PHY must
support EEE. A phy can be provided by both a phydev or phylink. Verify
at least one of these exist, not just phydev.

Fixes: aab9c406 ("net: dsa: Plug in PHYLINK support")
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef91b6f9

net/dsa/slave.c

+2 −2
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e) 
	int ret;



	/* Port's PHY and MAC both need to be EEE capable */

	if (!dev->phydev)

	if (!dev->phydev && !dp->pl)

		return -ENODEV;



	if (!ds->ops->set_mac_eee)
@@ -659,7 +659,7 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e) 
	int ret;



	/* Port's PHY and MAC both need to be EEE capable */

	if (!dev->phydev)

	if (!dev->phydev && !dp->pl)

		return -ENODEV;



	if (!ds->ops->get_mac_eee)