treewide: refresh patches
These need to be refreshed, probably the generic backports affected them. Link: https://github.com/openwrt/openwrt/pull/15765 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
f04e377a50
commit
215a3ca2a4
@ -25,7 +25,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
|
|||||||
case PHY_INTERFACE_MODE_QUSGMII:
|
case PHY_INTERFACE_MODE_QUSGMII:
|
||||||
--- a/drivers/net/phy/phylink.c
|
--- a/drivers/net/phy/phylink.c
|
||||||
+++ b/drivers/net/phy/phylink.c
|
+++ b/drivers/net/phy/phylink.c
|
||||||
@@ -218,6 +218,7 @@ static int phylink_interface_max_speed(p
|
@@ -231,6 +231,7 @@ static int phylink_interface_max_speed(p
|
||||||
return SPEED_1000;
|
return SPEED_1000;
|
||||||
|
|
||||||
case PHY_INTERFACE_MODE_2500BASEX:
|
case PHY_INTERFACE_MODE_2500BASEX:
|
||||||
|
@ -32,7 +32,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phylink.c
|
--- a/drivers/net/phy/phylink.c
|
||||||
+++ b/drivers/net/phy/phylink.c
|
+++ b/drivers/net/phy/phylink.c
|
||||||
@@ -505,6 +505,7 @@ unsigned long phylink_get_capabilities(p
|
@@ -518,6 +518,7 @@ unsigned long phylink_get_capabilities(p
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PHY_INTERFACE_MODE_2500BASEX:
|
case PHY_INTERFACE_MODE_2500BASEX:
|
||||||
|
@ -25,7 +25,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
|
|||||||
case PHY_INTERFACE_MODE_QUSGMII:
|
case PHY_INTERFACE_MODE_QUSGMII:
|
||||||
--- a/drivers/net/phy/phylink.c
|
--- a/drivers/net/phy/phylink.c
|
||||||
+++ b/drivers/net/phy/phylink.c
|
+++ b/drivers/net/phy/phylink.c
|
||||||
@@ -218,6 +218,7 @@ static int phylink_interface_max_speed(p
|
@@ -231,6 +231,7 @@ static int phylink_interface_max_speed(p
|
||||||
return SPEED_1000;
|
return SPEED_1000;
|
||||||
|
|
||||||
case PHY_INTERFACE_MODE_2500BASEX:
|
case PHY_INTERFACE_MODE_2500BASEX:
|
||||||
@ -33,7 +33,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
|
|||||||
return SPEED_2500;
|
return SPEED_2500;
|
||||||
|
|
||||||
case PHY_INTERFACE_MODE_5GBASER:
|
case PHY_INTERFACE_MODE_5GBASER:
|
||||||
@@ -526,6 +527,7 @@ unsigned long phylink_get_capabilities(p
|
@@ -539,6 +540,7 @@ unsigned long phylink_get_capabilities(p
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PHY_INTERFACE_MODE_2500BASEX:
|
case PHY_INTERFACE_MODE_2500BASEX:
|
||||||
|
@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
if (phydev->mii_ts && phydev->mii_ts->link_state)
|
if (phydev->mii_ts && phydev->mii_ts->link_state)
|
||||||
--- a/include/linux/phy.h
|
--- a/include/linux/phy.h
|
||||||
+++ b/include/linux/phy.h
|
+++ b/include/linux/phy.h
|
||||||
@@ -659,6 +659,7 @@ struct phy_device {
|
@@ -661,6 +661,7 @@ struct phy_device {
|
||||||
unsigned downshifted_rate:1;
|
unsigned downshifted_rate:1;
|
||||||
unsigned is_on_sfp_module:1;
|
unsigned is_on_sfp_module:1;
|
||||||
unsigned mac_managed_pm:1;
|
unsigned mac_managed_pm:1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user