diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
| commit | bc92b67c41bb9eb64dd342735cf04d0ca5098926 (patch) | |
| tree | fb3cad267265be9ac8eb1532182422f278dc3d0a /target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch | |
| parent | 9b2097af21c4298fb67622266d5587e4e680fc5c (diff) | |
| download | upstream-bc92b67c41bb9eb64dd342735cf04d0ca5098926.tar.gz upstream-bc92b67c41bb9eb64dd342735cf04d0ca5098926.tar.bz2 upstream-bc92b67c41bb9eb64dd342735cf04d0ca5098926.zip | |
port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but otherwise completely untested)
SVN-Revision: 12790
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch new file mode 100644 index 0000000000..5cc9cd2895 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch @@ -0,0 +1,26 @@ +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c +@@ -135,6 +135,9 @@ + struct phy_device *phydev = to_phy_device(dev); + struct phy_driver *phydrv = to_phy_driver(drv); + ++ if (phydrv->detect) ++ return (phydrv->detect(phydev->bus, phydev->addr)); ++ + return ((phydrv->phy_id & phydrv->phy_id_mask) == + (phydev->phy_id & phydrv->phy_id_mask)); + } +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -339,6 +339,11 @@ + u32 features; + u32 flags; + ++ /* Called during discovery to test if the ++ * device can attach to the bus, even if ++ * phy id and mask do not match */ ++ bool (*detect)(struct mii_bus *bus, int addr); ++ + /* + * Called to initialize the PHY, + * including after a reset |