projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.125 (FS#2305 FS#2297)
[oweals/openwrt.git]
/
target
/
linux
/
ramips
/
patches-4.14
/
0034-NET-multi-phy-support.patch
diff --git
a/target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch
b/target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch
index 7c2777c46716834090ea6ed17dc1b0c60eed093c..5536e3f61c3095a506516b12d5b487a2fbeeb9b1 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch
+++ b/
target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch
@@
-11,7
+11,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -9
81,7 +981
,10 @@ void phy_state_machine(struct work_struc
+@@ -9
13,7 +913
,10 @@ void phy_state_machine(struct work_struc
/* 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;
@@
-23,7
+23,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
break;
}
break;
}
-@@ -10
68,7 +1071
,10 @@ void phy_state_machine(struct work_struc
+@@ -10
00,7 +1003
,10 @@ void phy_state_machine(struct work_struc
phy_link_up(phydev);
} else {
phydev->state = PHY_NOLINK;
phy_link_up(phydev);
} else {
phydev->state = PHY_NOLINK;
@@
-35,7
+35,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
}
if (phy_interrupt_is_valid(phydev))
}
if (phy_interrupt_is_valid(phydev))
-@@ -10
78,7 +1084
,10 @@ void phy_state_machine(struct work_struc
+@@ -10
10,7 +1016
,10 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;