Skip to content

Commit

Permalink
net: dsa: qca8k: do not cache unneeded EEE fields
Browse files Browse the repository at this point in the history
The qca8k driver is currently caching a bitfield of the supported member
of a ethtool_eee private structure, which is unused.

Only the eee_enabled field of the private ethtool_eee copy is updated,
thus using p->advertised and p->lp_advertised is also erroneous.

Remove the usage of these private ethtool_eee members and only rely on
phy_ethtool_get_eee to assign the eee_active member.

Signed-off-by: Vivien Didelot <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
vivien authored and davem330 committed Aug 2, 2017
1 parent dca2098 commit a2444ab
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/net/dsa/qca8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,8 @@ static int
qca8k_eee_init(struct dsa_switch *ds, int port,
struct phy_device *phy)
{
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
struct ethtool_eee *p = &priv->port_sts[port].eee;
int ret;

p->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_100baseT_Full);

ret = phy_init_eee(phy, 0);
if (ret)
return 0;
Expand Down Expand Up @@ -705,12 +701,7 @@ qca8k_get_eee(struct dsa_switch *ds, int port,
int ret;

ret = phy_ethtool_get_eee(netdev->phydev, p);
if (!ret)
e->eee_active =
!!(p->supported & p->advertised & p->lp_advertised);
else
e->eee_active = 0;

e->eee_active = p->eee_active;
e->eee_enabled = p->eee_enabled;

return ret;
Expand Down

0 comments on commit a2444ab

Please sign in to comment.