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-0199-dpaa2-eth-Add-DCB-ops.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-0199-dpaa2-eth-Add-DCB-ops.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch b/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch index 3bf2826280..2d38b6b0d6 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch @@ -33,7 +33,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> depends on FSL_DPAA2_ETH && PTP_1588_CLOCK_QORIQ --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -3607,6 +3607,81 @@ static void del_ch_napi(struct dpaa2_eth +@@ -3612,6 +3612,81 @@ static void del_ch_napi(struct dpaa2_eth } } @@ -115,7 +115,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev) { struct device *dev; -@@ -3696,6 +3771,15 @@ static int dpaa2_eth_probe(struct fsl_mc +@@ -3701,6 +3776,15 @@ static int dpaa2_eth_probe(struct fsl_mc if (err) goto err_alloc_rings; @@ -141,7 +141,7 @@ Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> #include <linux/netdevice.h> #include <linux/if_vlan.h> #include <linux/fsl/mc.h> -@@ -422,6 +423,10 @@ struct dpaa2_eth_priv { +@@ -423,6 +424,10 @@ struct dpaa2_eth_priv { struct dpaa2_eth_cls_rule *cls_rules; u8 rx_cls_enabled; u8 vlan_cls_enabled; |