projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.4 to 4.4.89
[openwrt/openwrt.git]
/
target
/
linux
/
mvebu
/
patches-4.4
/
125-phy-provide-a-hook-for-link-up-link-down-events.patch
diff --git
a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch
b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch
index 75d30f6a085b1e96109dde06ca9fc255a94e5a4e..a27e6baec3dd91fbd1f29b7b3023a4cb4bb6bcc5 100644
(file)
--- a/
target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch
+++ b/
target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch
@@
-22,7
+22,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- 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
52,6 +852
,16 @@ void phy_start(struct phy_device *phydev
+@@ -8
49,6 +849
,16 @@ void phy_start(struct phy_device *phydev
}
EXPORT_SYMBOL(phy_start);
}
EXPORT_SYMBOL(phy_start);
@@
-39,7
+39,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
/**
* phy_state_machine - Handle the state machine
* @work: work_struct that describes the work to be done
/**
* phy_state_machine - Handle the state machine
* @work: work_struct that describes the work to be done
-@@ -89
3,8 +903
,7 @@ void phy_state_machine(struct work_struc
+@@ -89
0,8 +900
,7 @@ 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;
@@
-49,7
+49,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
break;
}
break;
}
-@@ -90
6,9 +915
,7 @@ void phy_state_machine(struct work_struc
+@@ -90
3,9 +912
,7 @@ void phy_state_machine(struct work_struc
/* If AN is done, we're running */
if (err > 0) {
phydev->state = PHY_RUNNING;
/* If AN is done, we're running */
if (err > 0) {
phydev->state = PHY_RUNNING;
@@
-60,7
+60,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
} else if (0 == phydev->link_timeout--)
needs_aneg = true;
break;
} else if (0 == phydev->link_timeout--)
needs_aneg = true;
break;
-@@ -93
3,8 +940
,7 @@ void phy_state_machine(struct work_struc
+@@ -93
0,8 +937
,7 @@ void phy_state_machine(struct work_struc
}
}
phydev->state = PHY_RUNNING;
}
}
phydev->state = PHY_RUNNING;
@@
-70,7
+70,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
}
break;
case PHY_FORCING:
}
break;
case PHY_FORCING:
-@@ -94
4,13 +950
,12 @@ void phy_state_machine(struct work_struc
+@@ -94
1,13 +947
,12 @@ void phy_state_machine(struct work_struc
if (phydev->link) {
phydev->state = PHY_RUNNING;
if (phydev->link) {
phydev->state = PHY_RUNNING;
@@
-86,7
+86,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
break;
case PHY_RUNNING:
/* Only register a CHANGE if we are polling or ignoring
break;
case PHY_RUNNING:
/* Only register a CHANGE if we are polling or ignoring
-@@ -9
82,14 +987
,12 @@ void phy_state_machine(struct work_struc
+@@ -9
79,14 +984
,12 @@ void phy_state_machine(struct work_struc
if (phydev->link) {
phydev->state = PHY_RUNNING;
if (phydev->link) {
phydev->state = PHY_RUNNING;
@@
-103,7
+103,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
if (phy_interrupt_is_valid(phydev))
err = phy_config_interrupt(phydev,
PHY_INTERRUPT_ENABLED);
if (phy_interrupt_is_valid(phydev))
err = phy_config_interrupt(phydev,
PHY_INTERRUPT_ENABLED);
-@@ -99
7,8 +1000
,7 @@ void phy_state_machine(struct work_struc
+@@ -99
4,8 +997
,7 @@ 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;
@@
-113,7
+113,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
do_suspend = true;
}
break;
do_suspend = true;
}
break;
-@@ -101
8,11 +1020
,11 @@ void phy_state_machine(struct work_struc
+@@ -101
5,11 +1017
,11 @@ void phy_state_machine(struct work_struc
if (phydev->link) {
phydev->state = PHY_RUNNING;
if (phydev->link) {
phydev->state = PHY_RUNNING;
@@
-127,7
+127,7
@@
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
} else {
phydev->state = PHY_AN;
phydev->link_timeout = PHY_AN_TIMEOUT;
} else {
phydev->state = PHY_AN;
phydev->link_timeout = PHY_AN_TIMEOUT;
-@@ -103
4,11 +1036
,11 @@ void phy_state_machine(struct work_struc
+@@ -103
1,11 +1033
,11 @@ void phy_state_machine(struct work_struc
if (phydev->link) {
phydev->state = PHY_RUNNING;
if (phydev->link) {
phydev->state = PHY_RUNNING;