mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
3da861ccca
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>
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;
|
|
}
|