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-0213-dpaa2-eth-Add-CEETM-qdisc-support.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-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch b/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch index 3e586e457a..9246e44d7a 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch @@ -1561,7 +1561,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com> static const struct net_device_ops dpaa2_eth_ops = { .ndo_open = dpaa2_eth_open, .ndo_start_xmit = dpaa2_eth_tx, -@@ -4166,18 +4186,27 @@ static int __init dpaa2_eth_driver_init( +@@ -4171,18 +4191,27 @@ static int __init dpaa2_eth_driver_init( dpaa2_eth_dbg_init(); err = fsl_mc_driver_register(&dpaa2_eth_driver); @@ -1596,7 +1596,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com> module_init(dpaa2_eth_driver_init); --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h -@@ -453,6 +453,8 @@ struct dpaa2_eth_priv { +@@ -454,6 +454,8 @@ struct dpaa2_eth_priv { struct dpaa2_debugfs dbg; #endif struct dpni_tx_shaping_cfg shaping_cfg; @@ -1605,7 +1605,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com> }; #define DPAA2_RXH_SUPPORTED (RXH_L2DA | RXH_VLAN | RXH_L3_PROTO \ -@@ -573,6 +575,11 @@ static inline unsigned int dpaa2_eth_rx_ +@@ -574,6 +576,11 @@ static inline unsigned int dpaa2_eth_rx_ return priv->tx_data_offset - DPAA2_ETH_RX_HWA_SIZE; } |