kernel: bump 5.4 to 5.4.110

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch b/target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
index e8b9e98247aeba105954282341deeb80160e7981..5acfeb9f97646192271a9f5d1f86e7fcb765f2fe 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +        taprio(802.1Qbv) and Credit Based Shaper(802.1Qbu).
 --- a/drivers/net/ethernet/freescale/enetc/enetc.c
 +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
-@@ -1524,6 +1524,8 @@ int enetc_setup_tc(struct net_device *nd
+@@ -1519,6 +1519,8 @@ int enetc_setup_tc(struct net_device *nd
                return enetc_setup_tc_mqprio(ndev, type_data);
        case TC_SETUP_QDISC_TAPRIO:
                return enetc_setup_tc_taprio(ndev, type_data);
@@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
 --- a/drivers/net/ethernet/freescale/enetc/enetc.h
 +++ b/drivers/net/ethernet/freescale/enetc/enetc.h
-@@ -255,7 +255,9 @@ int enetc_send_cmd(struct enetc_si *si,
+@@ -260,7 +260,9 @@ int enetc_send_cmd(struct enetc_si *si,
  #ifdef CONFIG_FSL_ENETC_QOS
  int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
  void enetc_sched_speed_set(struct net_device *ndev);
@@ -78,8 +78,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +#define ENETC_CBS_BW_MASK     GENMASK(6, 0)
  #define ENETC_PTCCBSR1(n)     (0x1114 + (n) * 8) /* n = 0 to 7*/
  #define ENETC_RSSHASH_KEY_SIZE        40
- #define ENETC_PRSSK(n)                (0x1410 + (n) * 4) /* n = [0..9] */
-@@ -677,6 +679,8 @@ struct enetc_cbd {
+ #define ENETC_PRSSCAPR                0x1404
+@@ -679,6 +681,8 @@ struct enetc_cbd {
        u8 status_flags;
  };