diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-09 11:52:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-09 11:52:36 -0700 |
| commit | a736e074680745faa5dc6be8dd3c58ad4850aab9 (patch) | |
| tree | 620e6d20cfce3806399fbefa8d911cc848463f9b /net/dsa | |
| parent | 192e91d244e376b32d90ffbf78c87a0fb35a4040 (diff) | |
| parent | 112cbae26d18e75098d95cc234cfa5059de8d479 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 1ba3bde96b55..962c4fd338ba 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -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) |