Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'firewire-fixes-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire fixes from Takashi Sakamoto:
"This includes some fixes for the topology map, newly introduced in
v6.18 kernel"
* tag 'firewire-fixes-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: core: fix to update generation field in topology map
firewire: core: Initialize topology_map.lock
+4
-1
+2
drivers/firewire/core-card.c
+2
drivers/firewire/core-card.c
···
577
577
INIT_LIST_HEAD(&card->transactions.list);
578
578
spin_lock_init(&card->transactions.lock);
579
579
580
+
spin_lock_init(&card->topology_map.lock);
581
+
580
582
card->split_timeout.hi = DEFAULT_SPLIT_TIMEOUT / 8000;
581
583
card->split_timeout.lo = (DEFAULT_SPLIT_TIMEOUT % 8000) << 19;
582
584
card->split_timeout.cycles = DEFAULT_SPLIT_TIMEOUT;
+2
-1
drivers/firewire/core-topology.c
+2
-1
drivers/firewire/core-topology.c
···
441
441
const u32 *self_ids, int self_id_count)
442
442
{
443
443
__be32 *map = buffer;
444
+
u32 next_generation = be32_to_cpu(buffer[1]) + 1;
444
445
int node_count = (root_node_id & 0x3f) + 1;
445
446
446
447
memset(map, 0, buffer_size);
447
448
448
449
*map++ = cpu_to_be32((self_id_count + 2) << 16);
449
-
*map++ = cpu_to_be32(be32_to_cpu(buffer[1]) + 1);
450
+
*map++ = cpu_to_be32(next_generation);
450
451
*map++ = cpu_to_be32((node_count << 16) | self_id_count);
451
452
452
453
while (self_id_count--)