diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-04-11 15:43:19 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-04-11 17:35:12 +0200 |
| commit | 3da861ccca53370a198db152197e42c3c7d1ea69 (patch) | |
| tree | 6631fe52bf2cb34dd59fc6923ddc78129eac5453 /target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch | |
| parent | 1663dc7e82f1bfbcfd6e7279e289048e6059110e (diff) | |
| download | upstream-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-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch | 14 |
1 files changed, 7 insertions, 7 deletions
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 45febf9646..73e67b273f 100644 --- 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) @@ -97,8 +97,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> } mark_as_read: ---- 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 @@ -51,11 +51,11 @@ static int can_rx_offload_napi_poll(stru while ((work_done < quota) && |