diff options
| author | Heiner Kallweit | 2018-01-10 21:21:31 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-01-15 19:45:03 +0100 |
| commit | 28b2e0d2cd132284ad69fcea4b7cf6b7d0662c2f (patch) | |
| tree | 78f7165cb7332eafcc5269525f01416de38683d9 /drivers/net/ethernet | |
| parent | tipc: fix a potental access after delete in tipc_sk_join() (diff) | |
| download | kernel-qcow2-linux-28b2e0d2cd132284ad69fcea4b7cf6b7d0662c2f.tar.gz kernel-qcow2-linux-28b2e0d2cd132284ad69fcea4b7cf6b7d0662c2f.tar.xz kernel-qcow2-linux-28b2e0d2cd132284ad69fcea4b7cf6b7d0662c2f.zip | |
net: phy: remove parameter new_link from phy_mac_interrupt()
I see two issues with parameter new_link:
1. It's not needed. See also phy_interrupt(), works w/o this parameter.
phy_mac_interrupt sets the state to PHY_CHANGELINK and triggers the
state machine which then calls phy_read_status. And phy_read_status
updates the link state.
2. phy_mac_interrupt is used in interrupt context and getting the link
state may sleep (at least when having to access the PHY registers
via MDIO bus).
So let's remove it.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 24b4f4ceceef..b1e35a9accf1 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2527,9 +2527,10 @@ static void bcmgenet_irq_task(struct work_struct *work) spin_unlock_irq(&priv->lock); /* Link UP/DOWN event */ - if (status & UMAC_IRQ_LINK_EVENT) - phy_mac_interrupt(priv->dev->phydev, - !!(status & UMAC_IRQ_LINK_UP)); + if (status & UMAC_IRQ_LINK_EVENT) { + priv->dev->phydev->link = !!(status & UMAC_IRQ_LINK_UP); + phy_mac_interrupt(priv->dev->phydev); + } } /* bcmgenet_isr1: handle Rx and Tx priority queues */ |