kernel: bump 5.4 to 5.4.106

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch b/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
index cba297efc1d9023c3fdd6fde6629598a3373d7c8..596309f706c4922b4703111dc3ae77749697dc25 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o
 --- a/drivers/net/ethernet/freescale/enetc/enetc.c
 +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
-@@ -1427,8 +1427,7 @@ int enetc_close(struct net_device *ndev)
+@@ -1422,8 +1422,7 @@ int enetc_close(struct net_device *ndev)
        return 0;
  }
  
@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
        struct tc_mqprio_qopt *mqprio = type_data;
-@@ -1436,9 +1435,6 @@ int enetc_setup_tc(struct net_device *nd
+@@ -1431,9 +1430,6 @@ int enetc_setup_tc(struct net_device *nd
        u8 num_tc;
        int i;
  
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
        num_tc = mqprio->num_tc;
  
-@@ -1483,6 +1479,19 @@ int enetc_setup_tc(struct net_device *nd
+@@ -1478,6 +1474,19 @@ int enetc_setup_tc(struct net_device *nd
        return 0;
  }
  
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
 --- a/drivers/net/ethernet/freescale/enetc/enetc.h
 +++ b/drivers/net/ethernet/freescale/enetc/enetc.h
-@@ -244,3 +244,10 @@ int enetc_set_fs_entry(struct enetc_si *
+@@ -249,3 +249,10 @@ int enetc_set_fs_entry(struct enetc_si *
  void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes);
  int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
  int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);