Patch "net: systemport: Fix missing Wake-on-LAN interrupt for SYSTEMPORT Lite" has been added to the 4.11-stable tree

Patch "net: systemport: Fix missing Wake-on-LAN interrupt for SYSTEMPORT Lite" has been added to the 4.11-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    net: systemport: Fix missing Wake-on-LAN interrupt for SYSTEMPORT Lite

to the 4.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-systemport-fix-missing-wake-on-lan-interrupt-for-systemport-lite.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Thu Jun  8 08:58:08 CEST 2017
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Thu, 1 Jun 2017 18:02:39 -0700
Subject: net: systemport: Fix missing Wake-on-LAN interrupt for SYSTEMPORT Lite

From: Florian Fainelli <f.fainelli@gmail.com>


[ Upstream commit d31353cd753c443ace5723d6878a39f393a0c136 ]

On SYSTEMPORT Lite, since we have the main interrupt source in the first
cell, the second cell is the Wake-on-LAN interrupt, yet the code was not
properly updated to fetch the second cell, and instead looked at the
third and non-existing cell for Wake-on-LAN.

Fixes: 44a4524c54af ("net: systemport: Add support for SYSTEMPORT Lite")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/broadcom/bcmsysport.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1968,9 +1968,12 @@ static int bcm_sysport_probe(struct plat
 	priv->num_rx_desc_words = params->num_rx_desc_words;
 
 	priv->irq0 = platform_get_irq(pdev, 0);
-	if (!priv->is_lite)
+	if (!priv->is_lite) {
 		priv->irq1 = platform_get_irq(pdev, 1);
-	priv->wol_irq = platform_get_irq(pdev, 2);
+		priv->wol_irq = platform_get_irq(pdev, 2);
+	} else {
+		priv->wol_irq = platform_get_irq(pdev, 1);
+	}
 	if (priv->irq0 <= 0 || (priv->irq1 <= 0 && !priv->is_lite)) {
 		dev_err(&pdev->dev, "invalid interrupts\n");
 		ret = -EINVAL;


Patches currently in stable-queue which might be from f.fainelli@gmail.com are

queue-4.11/net-dsa-fix-stale-cpu_switch-reference-after-unbind-then-bind.patch
queue-4.11/net-ethoc-enable-napi-before-poll-may-be-scheduled.patch
queue-4.11/net-systemport-fix-missing-wake-on-lan-interrupt-for-systemport-lite.patch