mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From f7f3c7abdef9fb6c9668a3945ec791fb206b4ee8 Mon Sep 17 00:00:00 2001
|
|
From: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Date: Fri, 1 Mar 2019 16:29:47 +0100
|
|
Subject: [PATCH] can: flexcan: flexcan_irq(): rename variable reg_iflag ->
|
|
reg_iflag_rx
|
|
|
|
This patch renames the variable reg_iflag in the flexcan_irq() function
|
|
to reg_iflag_rx. This better reflects the contents of the varibale. It
|
|
does not hold the unmodified iflag registers, instead all non RX
|
|
interrupts have been masked.
|
|
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -905,13 +905,13 @@ static irqreturn_t flexcan_irq(int irq,
|
|
|
|
/* reception interrupt */
|
|
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
|
|
- u64 reg_iflag;
|
|
+ u64 reg_iflag_rx;
|
|
int ret;
|
|
|
|
- while ((reg_iflag = flexcan_read_reg_iflag_rx(priv))) {
|
|
+ while ((reg_iflag_rx = flexcan_read_reg_iflag_rx(priv))) {
|
|
handled = IRQ_HANDLED;
|
|
ret = can_rx_offload_irq_offload_timestamp(&priv->offload,
|
|
- reg_iflag);
|
|
+ reg_iflag_rx);
|
|
if (!ret)
|
|
break;
|
|
}
|