aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-08-03 14:08:43 -0400
committerDavid S. Miller <davem@davemloft.net>2018-08-03 15:11:43 -0400
commit9e85e22713d6fed4873057493d6307c08b1d86a6 (patch)
tree89f66a57e1156235c25bc3f40512e306bceab8aa
parentc0e6820b7e4175171f302df6cc4706b818f4a691 (diff)
net: systemport: Do not re-configure upon WoL interrupt
We already properly resume from Wake-on-LAN whether such a condition occured or not, no need to process the WoL interrupt for functional changes since that could race with other settings. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/bcmsysport.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 631617d95769..7faad9e1a6f9 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1102,10 +1102,8 @@ static irqreturn_t bcm_sysport_rx_isr(int irq, void *dev_id)
1102 if (priv->irq0_stat & INTRL2_0_TX_RING_FULL) 1102 if (priv->irq0_stat & INTRL2_0_TX_RING_FULL)
1103 bcm_sysport_tx_reclaim_all(priv); 1103 bcm_sysport_tx_reclaim_all(priv);
1104 1104
1105 if (priv->irq0_stat & INTRL2_0_MPD) { 1105 if (priv->irq0_stat & INTRL2_0_MPD)
1106 netdev_info(priv->netdev, "Wake-on-LAN interrupt!\n"); 1106 netdev_info(priv->netdev, "Wake-on-LAN interrupt!\n");
1107 bcm_sysport_resume_from_wol(priv);
1108 }
1109 1107
1110 if (!priv->is_lite) 1108 if (!priv->is_lite)
1111 goto out; 1109 goto out;