aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-10-01 09:22:00 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-10-02 22:02:26 +0200
commitd6a9a92e32177e8236812045d09deacc4e36be26 (patch)
treeb42a2c4eea5d7d8e126a4cfeb45e572578ea6522 /target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
parent2d72671b6e7469dbc5b2e79cb1be77c4e13a9c92 (diff)
downloadupstream-d6a9a92e32177e8236812045d09deacc4e36be26.tar.gz
upstream-d6a9a92e32177e8236812045d09deacc4e36be26.tar.bz2
upstream-d6a9a92e32177e8236812045d09deacc4e36be26.zip
kernel: bump 5.4 to 5.4.69
Seemingly unneeded based on new upstream code so manually deleted: layerscape: 820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch Manually merged: generic-hack: 251-sound_kconfig.patch All other modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [add lantiq test report, minor commit message clarification] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch b/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
index 73dead7363..4974362d71 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch
@@ -19,7 +19,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -3776,6 +3776,83 @@ const struct dcbnl_rtnl_ops dpaa2_eth_dc
+@@ -3778,6 +3778,83 @@ const struct dcbnl_rtnl_ops dpaa2_eth_dc
};
#endif
@@ -103,7 +103,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)
{
struct device *dev;
-@@ -3895,6 +3972,7 @@ static int dpaa2_eth_probe(struct fsl_mc
+@@ -3897,6 +3974,7 @@ static int dpaa2_eth_probe(struct fsl_mc
#ifdef CONFIG_DEBUG_FS
dpaa2_dbg_add(priv);
#endif
@@ -111,7 +111,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
dev_info(dev, "Probed interface %s\n", net_dev->name);
return 0;
-@@ -3942,6 +4020,8 @@ static int dpaa2_eth_remove(struct fsl_m
+@@ -3944,6 +4022,8 @@ static int dpaa2_eth_remove(struct fsl_m
#ifdef CONFIG_DEBUG_FS
dpaa2_dbg_remove(priv);
#endif