kernel: bump 4.14 to 4.14.180
[oweals/openwrt.git] / target / linux / ramips / patches-5.4 / 990-NET-no-auto-carrier-off-support.patch
1 From 0b6eb1e68290243d439ee330ea8d0b239a5aec69 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sun, 27 Jul 2014 09:38:50 +0100
4 Subject: [PATCH 34/53] NET: multi phy support
5
6 Signed-off-by: John Crispin <blogic@openwrt.org>
7 ---
8  drivers/net/phy/phy.c |    9 ++++++---
9  include/linux/phy.h   |    1 +
10  2 files changed, 7 insertions(+), 3 deletions(-)
11
12 --- a/drivers/net/phy/phy.c
13 +++ b/drivers/net/phy/phy.c
14 @@ -546,7 +546,10 @@ static int phy_check_link_status(struct
15                 phy_link_up(phydev);
16         } else if (!phydev->link && phydev->state != PHY_NOLINK) {
17                 phydev->state = PHY_NOLINK;
18 -               phy_link_down(phydev, true);
19 +               if (!phydev->no_auto_carrier_off)
20 +                       phy_link_down(phydev, true);
21 +               else
22 +                       phy_link_down(phydev, false);
23         }
24  
25         return 0;
26 @@ -926,7 +929,10 @@ void phy_state_machine(struct work_struc
27         case PHY_HALTED:
28                 if (phydev->link) {
29                         phydev->link = 0;
30 -                       phy_link_down(phydev, true);
31 +                       if (!phydev->no_auto_carrier_off)
32 +                               phy_link_down(phydev, true);
33 +                       else
34 +                               phy_link_down(phydev, false);
35                 }
36                 do_suspend = true;
37                 break;
38 --- a/include/linux/phy.h
39 +++ b/include/linux/phy.h
40 @@ -380,6 +380,7 @@ struct phy_device {
41         unsigned suspended_by_mdio_bus:1;
42         unsigned sysfs_links:1;
43         unsigned loopback_enabled:1;
44 +       unsigned no_auto_carrier_off:1;
45  
46         unsigned autoneg:1;
47         /* The most recently read link state */