aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-04-11 15:43:19 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-04-11 17:35:12 +0200
commit3da861ccca53370a198db152197e42c3c7d1ea69 (patch)
tree6631fe52bf2cb34dd59fc6923ddc78129eac5453 /target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
parent1663dc7e82f1bfbcfd6e7279e289048e6059110e (diff)
downloadupstream-3da861ccca53370a198db152197e42c3c7d1ea69.tar.gz
upstream-3da861ccca53370a198db152197e42c3c7d1ea69.tar.bz2
upstream-3da861ccca53370a198db152197e42c3c7d1ea69.zip
kernel: bump 5.4 to 5.4.111
Refreshed all patches. The following patches were manually changed: * 610-netfilter_match_bypass_default_checks.patch * 611-netfilter_match_bypass_default_table.patch * 802-can-0002-can-rx-offload-fix-long-lines.patch * 802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch * 802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch * 802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch * 802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch * 802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch The can-dev.ko model was moved in the upstream kernel. Compile-tested on: x86/64, armvirt/64, ath79/generic Runtime-tested on: x86/64, armvirt/64, ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch b/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
index 45a20c4af6..077521cd6a 100644
--- a/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
@@ -13,8 +13,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
include/linux/can/rx-offload.h | 1 -
2 files changed, 8 deletions(-)
---- 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
@@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str
offload->skb_queue_len_max *= 4;
skb_queue_head_init(&offload->skb_queue);