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

Commit 15cfb720 authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: Set phydev->dev_flags only for internal PHYs 



[ Upstream commit 92696286f3bb37ba50e4bd8d1beb24afb759a799 ]

phydev->dev_flags is entirely dependent on the PHY device driver which
is going to be used, setting the internal GENET PHY revision in those
bits only makes sense when drivers/net/phy/bcm7xxx.c is the PHY driver
being used.

Fixes: 487320c5 ("net: bcmgenet: communicate integrated PHY revision to PHY driver")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0197645b

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

+3 −2
Original line number Diff line number Diff line
@@ -346,10 +346,11 @@ int bcmgenet_mii_probe(struct net_device *dev) 
	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct device_node *dn = priv->pdev->dev.of_node;

	struct phy_device *phydev;

	u32 phy_flags;

	u32 phy_flags = 0;

	int ret;



	/* Communicate the integrated PHY revision */

	if (priv->internal_phy)

		phy_flags = priv->gphy_rev;



	/* Initialize link state variables that bcmgenet_mii_setup() uses */