port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but...
[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 610-phy_detect.patch
1 --- a/drivers/net/phy/mdio_bus.c
2 +++ b/drivers/net/phy/mdio_bus.c
3 @@ -135,6 +135,9 @@
4 struct phy_device *phydev = to_phy_device(dev);
5 struct phy_driver *phydrv = to_phy_driver(drv);
6
7 + if (phydrv->detect)
8 + return (phydrv->detect(phydev->bus, phydev->addr));
9 +
10 return ((phydrv->phy_id & phydrv->phy_id_mask) ==
11 (phydev->phy_id & phydrv->phy_id_mask));
12 }
13 --- a/include/linux/phy.h
14 +++ b/include/linux/phy.h
15 @@ -339,6 +339,11 @@
16 u32 features;
17 u32 flags;
18
19 + /* Called during discovery to test if the
20 + * device can attach to the bus, even if
21 + * phy id and mask do not match */
22 + bool (*detect)(struct mii_bus *bus, int addr);
23 +
24 /*
25 * Called to initialize the PHY,
26 * including after a reset