diff options
Diffstat (limited to 'target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch b/target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch index 8b58c83312..9b67a8a518 100644 --- a/target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch +++ b/target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h -@@ -260,13 +260,13 @@ int dsa_port_mrp_add_ring_role(const str +@@ -261,13 +261,13 @@ int dsa_port_mrp_add_ring_role(const str const struct switchdev_obj_ring_role_mrp *mrp); int dsa_port_mrp_del_ring_role(const struct dsa_port *dp, const struct switchdev_obj_ring_role_mrp *mrp); @@ -38,7 +38,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> const struct net_device *dev) --- a/net/dsa/port.c +++ b/net/dsa/port.c -@@ -1076,7 +1076,7 @@ static void dsa_port_phylink_mac_link_up +@@ -1092,7 +1092,7 @@ static void dsa_port_phylink_mac_link_up speed, duplex, tx_pause, rx_pause); } @@ -47,7 +47,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> .validate = dsa_port_phylink_validate, .mac_pcs_get_state = dsa_port_phylink_mac_pcs_get_state, .mac_config = dsa_port_phylink_mac_config, -@@ -1085,6 +1085,30 @@ const struct phylink_mac_ops dsa_port_ph +@@ -1101,6 +1101,30 @@ const struct phylink_mac_ops dsa_port_ph .mac_link_up = dsa_port_phylink_mac_link_up, }; @@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable) { struct dsa_switch *ds = dp->ds; -@@ -1161,27 +1185,15 @@ static int dsa_port_phylink_register(str +@@ -1177,27 +1201,15 @@ static int dsa_port_phylink_register(str { struct dsa_switch *ds = dp->ds; struct device_node *port_dn = dp->dn; |