kernel: bump 5.4 to 5.4.42

[openwrt/staging/luka.git] / target / linux / layerscape / patches-5.4 / 701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch b/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch
index 513fcc4b2a51be1263622eff741ff999ef8f4156..8ac8ccf9bc2cc8693762096a9dc6946b5941c187 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch
@@ -87,7 +87,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
  
        /* Chech link state; speed / duplex changes are not treated yet */
        if (priv->link_state.up == state.up)
-@@ -3668,6 +3683,7 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3673,6 +3688,7 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
  {
        struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
        struct dpni_link_cfg link_cfg = {0};
@@ -95,7 +95,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
        int err;
  
        if (pfc->mbc || pfc->delay)
-@@ -3680,8 +3696,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3685,8 +3701,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
        /* We allow PFC configuration even if it won't have any effect until
         * general pause frames are enabled
         */
@@ -106,7 +106,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
                netdev_warn(net_dev, "Pause support must be enabled in order for PFC to work!\n");
  
        link_cfg.rate = priv->link_state.rate;
-@@ -3702,6 +3718,9 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
+@@ -3707,6 +3723,9 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s
                return err;
  
        memcpy(&priv->pfc, pfc, sizeof(priv->pfc));
@@ -118,7 +118,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
  }
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-@@ -422,7 +422,8 @@ struct dpaa2_eth_priv {
+@@ -423,7 +423,8 @@ struct dpaa2_eth_priv {
        struct dpaa2_eth_drv_stats __percpu *percpu_extras;
  
        u16 mc_token;
@@ -128,7 +128,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
  
        struct dpni_link_state link_state;
        bool do_link_poll;
-@@ -434,6 +435,7 @@ struct dpaa2_eth_priv {
+@@ -435,6 +436,7 @@ struct dpaa2_eth_priv {
        struct dpaa2_eth_cls_rule *cls_rules;
        u8 rx_cls_enabled;
        u8 vlan_cls_enabled;