projects
/
openwrt
/
staging
/
yousong.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mediatek: update patches
[openwrt/staging/yousong.git]
/
target
/
linux
/
mediatek
/
patches-4.4
/
0001-NET-multi-phy-support.patch
diff --git
a/target/linux/mediatek/patches-4.4/0001-NET-multi-phy-support.patch
b/target/linux/mediatek/patches-4.4/0001-NET-multi-phy-support.patch
index 4305906c9fd893a10fa497103cc7ce1603362f04..32b574992f377dd9c17d445757f845482d7616d5 100644
(file)
--- a/
target/linux/mediatek/patches-4.4/0001-NET-multi-phy-support.patch
+++ b/
target/linux/mediatek/patches-4.4/0001-NET-multi-phy-support.patch
@@
-1,7
+1,7
@@
From c30a296646a42302065ba452abe95b0b4b550883 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sun, 27 Jul 2014 09:38:50 +0100
From c30a296646a42302065ba452abe95b0b4b550883 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sun, 27 Jul 2014 09:38:50 +0100
-Subject: [PATCH 01/
8
1] NET: multi phy support
+Subject: [PATCH 01/
9
1] NET: multi phy support
Signed-off-by: John Crispin <blogic@openwrt.org>
---
Signed-off-by: John Crispin <blogic@openwrt.org>
---
@@
-9,9
+9,11
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
include/linux/phy.h | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
include/linux/phy.h | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
+diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
+index 47cd306..f69d12f 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -8
88,7 +888,8 @@ void phy_state_machine(struct work_struc
+@@ -8
44,7 +844,8 @@ void phy_state_machine(struct work_struct *work)
/* If the link is down, give up on negotiation for now */
if (!phydev->link) {
phydev->state = PHY_NOLINK;
/* If the link is down, give up on negotiation for now */
if (!phydev->link) {
phydev->state = PHY_NOLINK;
@@
-21,7
+23,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
phydev->adjust_link(phydev->attached_dev);
break;
}
phydev->adjust_link(phydev->attached_dev);
break;
}
-@@ -9
71,7 +972,8 @@ void phy_state_machine(struct work_struc
+@@ -9
27,7 +928,8 @@ void phy_state_machine(struct work_struct *work)
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
@@
-31,7
+33,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
}
phydev->adjust_link(phydev->attached_dev);
}
phydev->adjust_link(phydev->attached_dev);
-@@ -9
83,7 +985,8 @@ void phy_state_machine(struct work_struc
+@@ -9
39,7 +941,8 @@ void phy_state_machine(struct work_struct *work)
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
@@
-41,6
+43,8
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
phydev->adjust_link(phydev->attached_dev);
do_suspend = true;
}
phydev->adjust_link(phydev->attached_dev);
do_suspend = true;
}
+diff --git a/include/linux/phy.h b/include/linux/phy.h
+index 05fde31..276ab8a 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -377,6 +377,7 @@ struct phy_device {
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -377,6 +377,7 @@ struct phy_device {
@@
-51,3
+55,6
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
enum phy_state state;
enum phy_state state;
+--
+1.7.10.4
+