diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:52:33 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:52:33 +0100 |
| commit | 7625b23cfeb16a3dc9227467db6a4e7d3eed0908 (patch) | |
| tree | 14cf007cdbae318a6a04426e38e2fa88a2e1201f /drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | |
| parent | 59fa404bcafda5ddaf72c8a7be8181c88a8e3ce3 (diff) | |
| parent | 12bbe31f56df7fc344f6a14d313396d4675968ee (diff) | |
Merge branches 'mvebu-cpuidle' and 'mvneta' into clearfog
Diffstat (limited to 'drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c index 6ad1366270f7..e429876c7291 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c @@ -607,6 +607,7 @@ static void bcmasp_adj_link(struct net_device *dev) struct phy_device *phydev = dev->phydev; u32 cmd_bits = 0, reg; int changed = 0; + bool active; if (intf->old_link != phydev->link) { changed = 1; @@ -658,8 +659,8 @@ static void bcmasp_adj_link(struct net_device *dev) reg |= cmd_bits; umac_wl(intf, reg, UMC_CMD); - intf->eee.eee_active = phy_init_eee(phydev, 0) >= 0; - bcmasp_eee_enable_set(intf, intf->eee.eee_active); + active = phy_init_eee(phydev, 0) >= 0; + bcmasp_eee_enable_set(intf, active); } reg = rgmii_rl(intf, RGMII_OOB_CNTRL); |