kernel: update 4.9 to 4.9.44
[openwrt/staging/wigyori.git] / target / linux / ramips / patches-4.9 / 0034-NET-multi-phy-support.patch
index e11cc7a5ec9c6b815d7c5051ec016c56faf50135..9debcc8f3e2c9650ba68f24b77c69f014ad41b34 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -1032,7 +1032,8 @@ void phy_state_machine(struct work_struc
+@@ -1035,7 +1035,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;
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
                        phydev->adjust_link(phydev->attached_dev);
                        break;
                }
-@@ -1115,7 +1116,8 @@ void phy_state_machine(struct work_struc
+@@ -1127,7 +1128,8 @@ void phy_state_machine(struct work_struc
                        netif_carrier_on(phydev->attached_dev);
                } else {
                        phydev->state = PHY_NOLINK;
@@ -31,7 +31,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
                }
  
                phydev->adjust_link(phydev->attached_dev);
-@@ -1127,7 +1129,8 @@ void phy_state_machine(struct work_struc
+@@ -1139,7 +1141,8 @@ void phy_state_machine(struct work_struc
        case PHY_HALTED:
                if (phydev->link) {
                        phydev->link = 0;