aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-05-20 12:15:27 +0200
committerPetr Štetiar <ynezz@true.cz>2020-05-20 15:26:22 +0200
commit1b2fefb244d7d2fd949104e743ff15d01bbe5bb0 (patch)
treef0e969c3acedfab614bfd015f7553a870866bffb /target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
parent982d78777396731bf1abc5447100aafb09bba684 (diff)
downloadupstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.tar.gz
upstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.tar.bz2
upstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.zip
kernel: bump 5.4 to 5.4.42
Refreshed patches, removed upstreamed patch: generic/pending: 001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch Run tested: qemu-x86-64 Build tested: x86/64, ath79/nand, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch b/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
index 23deef6567..dfbb892c82 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch
@@ -15,7 +15,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
-@@ -3888,7 +3888,7 @@ static ssize_t dpaa2_eth_write_tx_shapin
+@@ -3893,7 +3893,7 @@ static ssize_t dpaa2_eth_write_tx_shapin
{
int err, items;
struct dpaa2_eth_priv *priv = netdev_priv(to_net_dev(dev));
@@ -24,7 +24,7 @@ Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
items = sscanf(buf, "%u %hu", &scfg.rate_limit, &scfg.max_burst_size);
if (items != 2) {
-@@ -3902,7 +3902,8 @@ static ssize_t dpaa2_eth_write_tx_shapin
+@@ -3907,7 +3907,8 @@ static ssize_t dpaa2_eth_write_tx_shapin
return -EINVAL;
}