kernel: bump 5.4 to 5.4.109

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
index 45febf96464ad806ab7eb99375b0aa76d81f7b62..1f4515ab7e09af6d0a40f2c42bc39e615ccaaa46 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
@@ -15,7 +15,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -629,10 +629,10 @@ static int flexcan_get_berr_counter(cons
+@@ -635,10 +635,10 @@ static int flexcan_get_berr_counter(cons
  static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        const struct flexcan_priv *priv = netdev_priv(dev);
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int i;
  
        if (can_dropped_invalid_skb(dev, skb))
-@@ -640,18 +640,18 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -646,18 +646,18 @@ static netdev_tx_t flexcan_start_xmit(st
  
        netif_stop_queue(dev);
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
        }
  
-@@ -823,7 +823,7 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -829,7 +829,7 @@ static struct sk_buff *flexcan_mailbox_r
        struct flexcan_regs __iomem *regs = priv->regs;
        struct flexcan_mb __iomem *mb;
        struct sk_buff *skb;
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u32 reg_ctrl, reg_id, reg_iflag1;
        int i;
  
-@@ -860,8 +860,8 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -866,8 +866,8 @@ static struct sk_buff *flexcan_mailbox_r
                reg_ctrl = priv->read(&mb->can_ctrl);
        }
  
@@ -73,7 +73,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                skb = ERR_PTR(-ENOMEM);
                goto mark_as_read;
        }
-@@ -871,17 +871,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -877,17 +877,17 @@ static struct sk_buff *flexcan_mailbox_r
  
        reg_id = priv->read(&mb->can_id);
        if (reg_ctrl & FLEXCAN_MB_CNT_IDE)