diff options
| author | John Crispin <john@openwrt.org> | 2013-08-14 18:15:15 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-08-14 18:15:15 +0000 |
| commit | 9e5b0cc19cebf6ed876c7eace13b887b46e518c0 (patch) | |
| tree | f246f12adca3e91f5e3708e97c7a4add05cc0ce3 /target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch | |
| parent | 2864fb107f00531df0b114d52334d3e00fa5d6c2 (diff) | |
| download | upstream-9e5b0cc19cebf6ed876c7eace13b887b46e518c0.tar.gz upstream-9e5b0cc19cebf6ed876c7eace13b887b46e518c0.tar.bz2 upstream-9e5b0cc19cebf6ed876c7eace13b887b46e518c0.zip | |
ramips: update v3.10 patches
Sync the patches with those sent upstream for v3.12.
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 37778
Diffstat (limited to 'target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch deleted file mode 100644 index 345ee14434..0000000000 --- a/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7407b7d178e783074861a73da858b099f870270d Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Sat, 11 May 2013 23:40:19 +0200 -Subject: [PATCH 14/33] NET: multi phy support - -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - drivers/net/phy/phy.c | 9 ++++++--- - include/linux/phy.h | 2 +- - 2 files changed, 7 insertions(+), 4 deletions(-) - ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -820,7 +820,8 @@ void phy_state_machine(struct work_struc - * negotiation for now */ - if (!phydev->link) { - phydev->state = PHY_NOLINK; -- netif_carrier_off(phydev->attached_dev); -+ if (!phydev->no_auto_carrier_off) -+ netif_carrier_off(phydev->attached_dev); - phydev->adjust_link(phydev->attached_dev); - break; - } -@@ -890,7 +891,8 @@ void phy_state_machine(struct work_struc - netif_carrier_on(phydev->attached_dev); - } else { - phydev->state = PHY_NOLINK; -- netif_carrier_off(phydev->attached_dev); -+ if (!phydev->no_auto_carrier_off) -+ netif_carrier_off(phydev->attached_dev); - } - - phydev->adjust_link(phydev->attached_dev); -@@ -902,7 +904,8 @@ void phy_state_machine(struct work_struc - case PHY_HALTED: - if (phydev->link) { - phydev->link = 0; -- netif_carrier_off(phydev->attached_dev); -+ if (!phydev->no_auto_carrier_off) -+ netif_carrier_off(phydev->attached_dev); - phydev->adjust_link(phydev->attached_dev); - } - break; ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -298,7 +298,7 @@ struct phy_device { - - struct phy_c45_device_ids c45_ids; - bool is_c45; -- -+ bool no_auto_carrier_off; - enum phy_state state; - - u32 dev_flags; |