Skip to content

Commit f411e25

Browse files
author
Paolo Abeni
committed
Merge tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2024-03-20 this is a pull request of 1 patch for net/master. Martin Jocić contributes a fix for the kvaser_pciefd driver, so that up to 8 channels on the Xilinx-based adapters can be used. This issue has been introduced in net-next for v6.9. linux-can-fixes-for-6.9-20240319 * tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can: can: kvaser_pciefd: Add additional Xilinx interrupts ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
2 parents e413785 + af1752e commit f411e25

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/can/kvaser_pciefd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ static const struct kvaser_pciefd_irq_mask kvaser_pciefd_sf2_irq_mask = {
370370

371371
static const struct kvaser_pciefd_irq_mask kvaser_pciefd_xilinx_irq_mask = {
372372
.kcan_rx0 = BIT(4),
373-
.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19) },
374-
.all = GENMASK(19, 16) | BIT(4),
373+
.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19), BIT(20), BIT(21), BIT(22), BIT(23) },
374+
.all = GENMASK(23, 16) | BIT(4),
375375
};
376376

377377
static const struct kvaser_pciefd_dev_ops kvaser_pciefd_altera_dev_ops = {

0 commit comments

Comments
 (0)