Date: Fri, 11 Apr 2008 16:27:59 +0200 From: Philippe De Muyter Subject: ieee1394: limit early node speed to host interface speed The following patch limits the node speed to the host interface speed, before using it. Signed-off-by: Philippe De Muyter It should actually suffice to do this only for the local node's speedcap[]. But there is another bug in the speed calculation: The local node's speed is not correctly propagated to the speeds which are to be used to access remote nodes. http://thread.gmane.org/gmane.linux.kernel.firewire.devel/11772/focus=12024 Signed-off-by: Stefan Richter --- drivers/ieee1394/ieee1394_core.c | 2 ++ 1 file changed, 2 insertions(+) Index: linux/drivers/ieee1394/ieee1394_core.c =================================================================== --- linux.orig/drivers/ieee1394/ieee1394_core.c +++ linux/drivers/ieee1394/ieee1394_core.c @@ -373,6 +373,8 @@ static void build_speed_map(struct hpsb_ if (sid->port2 == SELFID_PORT_CHILD) cldcnt[n]++; speedcap[n] = sid->speed; + if (speedcap[n] > host->csr.lnk_spd) + speedcap[n] = host->csr.lnk_spd; n--; } }