projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: refresh kernel patches
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
ramips
/
patches-3.14
/
0033-NET-multi-phy-support.patch
diff --git
a/target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch
b/target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch
index 99dd092b5361142dadb1b3f1fb76e4cc01d934fb..b337f5b78e2dc06c8e11b7a68fbd90a18b028650 100644
(file)
--- a/
target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch
+++ b/
target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch
@@
-9,11
+9,9
@@
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 76d96b9..371f0b6 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
-@@ -7
15,7 +715,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -7
64,7 +764,8 @@ 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
+21,7
@@
index 76d96b9..371f0b6 100644
phydev->adjust_link(phydev->attached_dev);
break;
}
phydev->adjust_link(phydev->attached_dev);
break;
}
-@@ -
781,7 +782,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -
841,7 +842,8 @@ void phy_state_machine(struct work_struc
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
netif_carrier_on(phydev->attached_dev);
} else {
phydev->state = PHY_NOLINK;
@@
-33,7
+31,7
@@
index 76d96b9..371f0b6 100644
}
phydev->adjust_link(phydev->attached_dev);
}
phydev->adjust_link(phydev->attached_dev);
-@@ -
793,7 +795,8 @@ void phy_state_machine(struct work_struct *work)
+@@ -
853,7 +855,8 @@ 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;
@@
-41,10
+39,8
@@
index 76d96b9..371f0b6 100644
+ if (!phydev->no_auto_carrier_off)
+ netif_carrier_off(phydev->attached_dev);
phydev->adjust_link(phydev->attached_dev);
+ if (!phydev->no_auto_carrier_off)
+ netif_carrier_off(phydev->attached_dev);
phydev->adjust_link(phydev->attached_dev);
- do_suspend =
1
;
+ do_suspend =
true
;
}
}
-diff --git a/include/linux/phy.h b/include/linux/phy.h
-index 565188c..91b93f7 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -308,6 +308,7 @@ struct phy_device {
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -308,6 +308,7 @@ struct phy_device {
@@
-55,6
+51,3
@@
index 565188c..91b93f7 100644
enum phy_state state;
enum phy_state state;
---
-1.7.10.4
-