Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d314502 authored by Doug Berger's avatar Doug Berger Committed by David S. Miller
Browse files

net: bcmgenet: correct bad merge 

As noted in the net-next submission for GENETv5 support [1], there
were merge conflicts with an earlier net submission [2] that had not
yet found its way to the net-next repository.

Unfortunately, when the branches were merged the conflicts were not
correctly resolved.  This commit attempts to correct that.

[1] https://lkml.org/lkml/2017/3/13/1145
[2] https://lkml.org/lkml/2017/3/9/890

Fixes: 101c4314 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"

)
Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88ca59d1

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −17
Original line number Diff line number Diff line
@@ -2602,12 +2602,6 @@ static void bcmgenet_irq_task(struct work_struct *work) 
	priv->irq0_stat = 0;

	spin_unlock_irqrestore(&priv->lock, flags);



	if (status & UMAC_IRQ_MPD_R) {

		netif_dbg(priv, wol, priv->dev,

			  "magic packet detected, waking up\n");

		bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);

	}



	/* Link UP/DOWN event */

	if (status & UMAC_IRQ_LINK_EVENT)

		phy_mac_interrupt(priv->phydev,
@@ -2698,23 +2692,13 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id) 
		}

	}



	if (priv->irq0_stat & (UMAC_IRQ_PHY_DET_R |

				UMAC_IRQ_PHY_DET_F |

				UMAC_IRQ_LINK_EVENT |

				UMAC_IRQ_HFB_SM |

				UMAC_IRQ_HFB_MM)) {

		/* all other interested interrupts handled in bottom half */

		schedule_work(&priv->bcmgenet_irq_work);

	}



	if ((priv->hw_params->flags & GENET_HAS_MDIO_INTR) &&

		status & (UMAC_IRQ_MDIO_DONE | UMAC_IRQ_MDIO_ERROR)) {

		wake_up(&priv->wq);

	}



	/* all other interested interrupts handled in bottom half */

	status &= (UMAC_IRQ_LINK_EVENT |

		   UMAC_IRQ_MPD_R);

	status &= UMAC_IRQ_LINK_EVENT;

	if (status) {

		/* Save irq status for bottom-half processing. */

		spin_lock_irqsave(&priv->lock, flags);