tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

* 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
phy: Fix phy_id for Vitesse 824x PHY

Linus Torvalds 0471448f edd5cd4a

+3 -2
+2 -1
drivers/net/phy/mdio_bus.c
··· 131 131 struct phy_device *phydev = to_phy_device(dev); 132 132 struct phy_driver *phydrv = to_phy_driver(drv); 133 133 134 - return (phydrv->phy_id == (phydev->phy_id & phydrv->phy_id_mask)); 134 + return ((phydrv->phy_id & phydrv->phy_id_mask) == 135 + (phydev->phy_id & phydrv->phy_id_mask)); 135 136 } 136 137 137 138 /* Suspend and resume. Copied from platform_suspend and
+1 -1
drivers/net/phy/vitesse.c
··· 84 84 85 85 /* Vitesse 824x */ 86 86 static struct phy_driver vsc8244_driver = { 87 - .phy_id = 0x000fc6c2, 87 + .phy_id = 0x000fc6c0, 88 88 .name = "Vitesse VSC8244", 89 89 .phy_id_mask = 0x000fffc0, 90 90 .features = PHY_GBIT_FEATURES,