diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-05-20 12:15:27 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-20 15:26:22 +0200 |
| commit | 1b2fefb244d7d2fd949104e743ff15d01bbe5bb0 (patch) | |
| tree | f0e969c3acedfab614bfd015f7553a870866bffb /target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch | |
| parent | 982d78777396731bf1abc5447100aafb09bba684 (diff) | |
| download | upstream-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-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch b/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch index 317ed78f25..4c9ae512a0 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch @@ -18,7 +18,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -2603,6 +2603,118 @@ out_err: +@@ -2608,6 +2608,118 @@ out_err: priv->enqueue = dpaa2_eth_enqueue_qd; } @@ -137,7 +137,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> /* Configure the DPNI object this interface is associated with */ static int setup_dpni(struct fsl_mc_device *ls_dev) { -@@ -2665,6 +2777,10 @@ static int setup_dpni(struct fsl_mc_devi +@@ -2670,6 +2782,10 @@ static int setup_dpni(struct fsl_mc_devi goto close; } @@ -150,7 +150,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> if (!priv->cls_rules) --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h -@@ -413,6 +413,7 @@ struct dpaa2_eth_priv { +@@ -414,6 +414,7 @@ struct dpaa2_eth_priv { u64 rx_cls_fields; struct dpaa2_eth_cls_rule *cls_rules; u8 rx_cls_enabled; |