summaryrefslogtreecommitdiff
path: root/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-06-30 13:10:12 +0000
committerJonas Gorski <jogo@openwrt.org>2013-06-30 13:10:12 +0000
commit0d9f760f272f3ccb3abcaca8e678734b666e234c (patch)
tree14237dc1b483b6fefbf696164b80f594e9826e49 /target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch
parent6a4e78dca6ecd4325504f0a74cd1816275157eea (diff)
downloadmtk-20170518-0d9f760f272f3ccb3abcaca8e678734b666e234c.zip
mtk-20170518-0d9f760f272f3ccb3abcaca8e678734b666e234c.tar.gz
mtk-20170518-0d9f760f272f3ccb3abcaca8e678734b666e234c.tar.bz2
kernel: update linux 3.9 to 3.9.8
Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37103
Diffstat (limited to 'target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch')
-rw-r--r--target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch13
1 files changed, 3 insertions, 10 deletions
diff --git a/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch
index 62133ef..8279487 100644
--- a/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch
+++ b/target/linux/ramips/patches-3.9/0157-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 ef9ea92..27f9b45 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -800,7 +800,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -847,7 +847,8 @@ void phy_state_machine(struct work_struc
* negotiation for now */
if (!phydev->link) {
phydev->state = PHY_NOLINK;
@@ -23,7 +21,7 @@ index ef9ea92..27f9b45 100644
phydev->adjust_link(phydev->attached_dev);
break;
}
-@@ -891,7 +892,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -938,7 +939,8 @@ void phy_state_machine(struct work_struc
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
@@ -33,7 +31,7 @@ index ef9ea92..27f9b45 100644
}
phydev->adjust_link(phydev->attached_dev);
-@@ -903,7 +905,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -950,7 +952,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
@@ -43,8 +41,6 @@ index ef9ea92..27f9b45 100644
phydev->adjust_link(phydev->attached_dev);
}
break;
-diff --git a/include/linux/phy.h b/include/linux/phy.h
-index 33999ad..9c54bc9 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -298,7 +298,7 @@ struct phy_device {
@@ -56,6 +52,3 @@ index 33999ad..9c54bc9 100644
enum phy_state state;
u32 dev_flags;
---
-1.7.10.4
-