diff options
| author | John Audia <graysky@archlinux.us> | 2021-04-07 10:13:50 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-04-10 20:27:40 +0200 |
| commit | b0a34e886da1ccfa356133381cd3ab7a79f4c7b3 (patch) | |
| tree | ab7fb617cfb92b21df4bfdf11368d9e10083aa00 /target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch | |
| parent | 558596bcd495c28ed8ca389ab47b6e0025f17f55 (diff) | |
| download | upstream-b0a34e886da1ccfa356133381cd3ab7a79f4c7b3.tar.gz upstream-b0a34e886da1ccfa356133381cd3ab7a79f4c7b3.tar.bz2 upstream-b0a34e886da1ccfa356133381cd3ab7a79f4c7b3.zip | |
kernel: bump 5.4 to 5.4.110
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased due to movement of rx-offload.c in 5.4.110:
layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch index 09961c88d8..d5c88ac0c8 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch @@ -19,7 +19,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/flexcan.c | 27 +++++++++++----- - drivers/net/can/rx-offload.c | 70 ++++++++++-------------------------------- + drivers/net/can/dev/rx-offload.c | 70 ++++++++++-------------------------------- include/linux/can/rx-offload.h | 6 ++-- 3 files changed, 40 insertions(+), 63 deletions(-) @@ -98,8 +98,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> } ---- a/drivers/net/can/rx-offload.c -+++ b/drivers/net/can/rx-offload.c +--- a/drivers/net/can/dev/rx-offload.c ++++ b/drivers/net/can/dev/rx-offload.c @@ -139,71 +139,35 @@ static int can_rx_offload_compare(struct static struct sk_buff * can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n) |