diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-03-24 20:57:12 +0100 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-04-18 17:55:36 +0200 |
commit | 25b1c3d8889f982ebc6c7b996cfc7fa5f1dce533 (patch) | |
tree | 1af972dbd20246573115769af3b6baa9d489fdab /drivers/firewire/fw-topology.c | |
parent | 2a0a2590498be7b92e3e76409c9b8ee722e23c8f (diff) | |
download | op-kernel-dev-25b1c3d8889f982ebc6c7b996cfc7fa5f1dce533.zip op-kernel-dev-25b1c3d8889f982ebc6c7b996cfc7fa5f1dce533.tar.gz |
firewire: fix synchronization of gap counts
Fix: The fact that nodes had different gap counts would be overlooked
if the bus manager code would pick gap count 63 because of beta
repeaters or because of very large hop counts. In this case, the bus
manager code would miss that it actually has to send the PHY config
packet with gap count 63.
Related trivial changes: Use bool for an int used as bool, touch up
some comments.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-topology.c')
-rw-r--r-- | drivers/firewire/fw-topology.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c index ebdec4c..213b0ff 100644 --- a/drivers/firewire/fw-topology.c +++ b/drivers/firewire/fw-topology.c @@ -290,12 +290,11 @@ static struct fw_node *build_tree(struct fw_card *card, beta_repeaters_present = true; /* - * If all PHYs does not report the same gap count - * setting, we fall back to 63 which will force a gap - * count reconfiguration and a reset. + * If PHYs report different gap counts, set an invalid count + * which will force a gap count reconfiguration and a reset. */ if (SELF_ID_GAP_COUNT(q) != gap_count) - gap_count = 63; + gap_count = 0; update_hop_count(node); |