aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch')
-rw-r--r--target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch13
1 files changed, 3 insertions, 10 deletions
diff --git a/target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch b/target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch
index 604a247985..690ada3256 100644
--- a/target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch
+++ b/target/linux/lantiq/patches-3.10/0022-NET-multi-phy-support.patch
@@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
include/linux/phy.h | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
-diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
-index 38f0b31..ad64a75 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -773,7 +773,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -820,7 +820,8 @@ void phy_state_machine(struct work_struc
* negotiation for now */
if (!phydev->link) {
phydev->state = PHY_NOLINK;
@@ -23,7 +21,7 @@ index 38f0b31..ad64a75 100644
phydev->adjust_link(phydev->attached_dev);
break;
}
-@@ -843,7 +844,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -890,7 +891,8 @@ void phy_state_machine(struct work_struc
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
@@ -33,7 +31,7 @@ index 38f0b31..ad64a75 100644
}
phydev->adjust_link(phydev->attached_dev);
-@@ -855,7 +857,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -902,7 +904,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
@@ -43,8 +41,6 @@ index 38f0b31..ad64a75 100644
phydev->adjust_link(phydev->attached_dev);
}
break;
-diff --git a/include/linux/phy.h b/include/linux/phy.h
-index 9e11039..9a8ca78 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -298,7 +298,7 @@ struct phy_device {
@@ -56,6 +52,3 @@ index 9e11039..9a8ca78 100644
enum phy_state state;
u32 dev_flags;
---
-1.7.10.4
-