domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: update 3.14 to 3.14.18

Browse Source 
Targets were build tested and patches are refreshed.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 42463
This commit is contained in:
Luka Perkov
2014-09-10 21:40:19 +00:00
parent 7be0ed78e7
commit 02629d8f87
376 changed files with 1349 additions and 5713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/ramips/patches-3.14/0033-NET-multi-phy-support.patch
View File

@@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
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
@@ -715,7 +715,8 @@ void phy_state_machine(struct work_struct *work)
@@ -764,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;
@@ -23,7 +21,7 @@ index 76d96b9..371f0b6 100644
phydev->adjust_link(phydev->attached_dev);
break;
}
@@ -781,7 +782,8 @@ void phy_state_machine(struct work_struct *work)
@@ -830,7 +831,8 @@ void phy_state_machine(struct work_struc
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);
@@ -793,7 +795,8 @@ void phy_state_machine(struct work_struct *work)
@@ -842,7 +844,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED:
if (phydev->link) {
phydev->link = 0;
@@ -43,8 +41,6 @@ index 76d96b9..371f0b6 100644
phydev->adjust_link(phydev->attached_dev);
do_suspend = 1;
}
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 {
@@ -55,6 +51,3 @@ index 565188c..91b93f7 100644
enum phy_state state;
--
1.7.10.4