kernel: bump 5.4 to 5.4.110

[openwrt/staging/chunkeey.git] / target / linux / layerscape / patches-5.4 / 802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch

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 09961c88d8f45c0a4437bd786626e0a9f2708967..d5c88ac0c84528766f0abdef85b10a89f83c74e6 100644 (file)
--- 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)