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 | 15f17fcf7e6d0430b701f34b8db63435754d2e45 (patch) | |
tree | cd04d6e88ffc7cca75a9ad1040caa9417253b4f7 /target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch | |
parent | 9d792824bce6ddd5aed83ec1a384da204db30f1a (diff) | |
download | master-187ad058-15f17fcf7e6d0430b701f34b8db63435754d2e45.tar.gz master-187ad058-15f17fcf7e6d0430b701f34b8db63435754d2e45.tar.bz2 master-187ad058-15f17fcf7e6d0430b701f34b8db63435754d2e45.zip |
port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but otherwise completely untested)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12790 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 |