Merge branch 'bcmgenet_systemport'

Florian Fainelli says:

====================
net: bcmgenet & systemport fixes

This patch series fixes an off-by-one error introduced during a previous
change, and the two other fixes fix a wake depth imbalance situation for
the Wake-on-LAN interrupt line.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 9 insertions, 7 deletions

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 075688188644..9ae36979bdee 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -436,7 +436,8 @@ static int bcm_sysport_set_wol(struct net_device *dev,
         /* Flag the device and relevant IRQ as wakeup capable */
         if (wol->wolopts) {
                 device_set_wakeup_enable(kdev, 1);
-                enable_irq_wake(priv->wol_irq);
+                if (priv->wol_irq_disabled)
+                        enable_irq_wake(priv->wol_irq);
                 priv->wol_irq_disabled = 0;
         } else {
                 device_set_wakeup_enable(kdev, 0);
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index fff2634b6f34..fdc9ec09e453 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1285,11 +1285,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv,
                 cb = &priv->rx_cbs[priv->rx_read_ptr];
                 skb = cb->skb;
 
-                rxpktprocessed++;
-
-                priv->rx_read_ptr++;
-                priv->rx_read_ptr &= (priv->num_rx_bds - 1);
-
                 /* We do not have a backing SKB, so we do not have a
                  * corresponding DMA mapping for this incoming packet since
                  * bcmgenet_rx_refill always either has both skb and mapping or
@@ -1404,6 +1399,10 @@ refill:
                 err = bcmgenet_rx_refill(priv, cb);
                 if (err)
                         netif_err(priv, rx_err, dev, "Rx refill failed\n");
+
+                rxpktprocessed++;
+                priv->rx_read_ptr++;
+                priv->rx_read_ptr &= (priv->num_rx_bds - 1);
         }
 
         return rxpktprocessed;
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
index b82b7e4e06b2..149a0d70c108 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
@@ -86,7 +86,9 @@ int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         /* Flag the device and relevant IRQ as wakeup capable */
         if (wol->wolopts) {
                 device_set_wakeup_enable(kdev, 1);
-                enable_irq_wake(priv->wol_irq);
+                /* Avoid unbalanced enable_irq_wake calls */
+                if (priv->wol_irq_disabled)
+                        enable_irq_wake(priv->wol_irq);
                 priv->wol_irq_disabled = false;
         } else {
                 device_set_wakeup_enable(kdev, 0);