diff options
| author | John Crispin <blogic@openwrt.org> | 2013-07-22 13:52:32 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-07-22 13:52:32 +0000 |
| commit | 020c18be59888443948895663079574ce54d2fd8 (patch) | |
| tree | 24f396509057722aa70d908e7be2132777b9dcf5 /target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch | |
| parent | bd2cbce22c162e9bc56b27bbcda95b7877b3a89f (diff) | |
| download | master-187ad058-020c18be59888443948895663079574ce54d2fd8.tar.gz master-187ad058-020c18be59888443948895663079574ce54d2fd8.tar.bz2 master-187ad058-020c18be59888443948895663079574ce54d2fd8.zip | |
ralink: set v3.10 as default
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37497 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch deleted file mode 100644 index 8279487163..0000000000 --- a/target/linux/ramips/patches-3.9/0157-NET-multi-phy-support.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 611c89720d9992d54da93bd946000c574d23f2b7 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Sat, 11 May 2013 23:40:19 +0200 -Subject: [PATCH 157/164] 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 -@@ -847,7 +847,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; - } -@@ -938,7 +939,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); -@@ -950,7 +952,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; |