kernel: bump 5.4 to 5.4.92

[openwrt/openwrt.git] / target / linux / mediatek / patches-5.4 / 0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch

diff --git a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
index a9b2b603bba7e944bd14b37d0d5b67cbd3a736fc..3bf1d0c13577ed61ed0868acd2c7c225b754f752 100644 (file)
--- a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
+++ b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  /* Queue modes */
  #define MVPP2_QDIST_SINGLE_MODE       0
-@@ -3467,8 +3470,9 @@ static void mvpp2_start_dev(struct mvpp2
+@@ -3468,8 +3471,9 @@ static void mvpp2_start_dev(struct mvpp2
                        .interface = port->phy_interface,
                };
                mvpp2_mac_config(&port->phylink_config, MLO_AN_INBAND, &state);
@@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        netif_tx_start_all_queues(port->dev);
-@@ -5124,8 +5128,11 @@ static void mvpp2_mac_config(struct phyl
+@@ -5137,8 +5141,11 @@ static void mvpp2_mac_config(struct phyl
        mvpp2_port_enable(port);
  }
  
@@ -107,11 +107,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +                            int speed, int duplex,
 +                            bool tx_pause, bool rx_pause)
  {
-       struct net_device *dev = to_net_dev(config->dev);
-       struct mvpp2_port *port = netdev_priv(dev);
+       struct mvpp2_port *port = mvpp2_phylink_to_port(config);
+       u32 val;
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -445,9 +445,10 @@ static void mtk_mac_link_down(struct phy
+@@ -449,9 +449,10 @@ static void mtk_mac_link_down(struct phy
        mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
  }
  
@@ -127,7 +127,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                           phylink_config);
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -951,8 +951,10 @@ static void stmmac_mac_link_down(struct
+@@ -925,8 +925,10 @@ static void stmmac_mac_link_down(struct
  }
  
  static void stmmac_mac_link_up(struct phylink_config *config,
@@ -141,7 +141,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
 +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-@@ -1488,9 +1488,10 @@ static void axienet_mac_link_down(struct
+@@ -1499,9 +1499,10 @@ static void axienet_mac_link_down(struct
  }
  
  static void axienet_mac_link_up(struct phylink_config *config,