diff options
| author | John Crispin <blogic@openwrt.org> | 2013-08-14 18:15:15 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-08-14 18:15:15 +0000 |
| commit | b9aed7de867a25b5b25ec73107aad58694920dab (patch) | |
| tree | d43e79ac4ba86ff1867147c7e55ff19ace92cb9a /target/linux/ramips/patches-3.10/0109-NET-multi-phy-support.patch | |
| parent | 4e0f16aad4b317d3625bba23334f44053672cf43 (diff) | |
| download | master-187ad058-b9aed7de867a25b5b25ec73107aad58694920dab.tar.gz master-187ad058-b9aed7de867a25b5b25ec73107aad58694920dab.tar.bz2 master-187ad058-b9aed7de867a25b5b25ec73107aad58694920dab.zip | |
ramips: update v3.10 patches
Sync the patches with those sent upstream for v3.12.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37778 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.10/0109-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.10/0109-NET-multi-phy-support.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.10/0109-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.10/0109-NET-multi-phy-support.patch new file mode 100644 index 0000000000..345ee14434 --- /dev/null +++ b/target/linux/ramips/patches-3.10/0109-NET-multi-phy-support.patch @@ -0,0 +1,54 @@ +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; |