bluetooth pairing issue in kernel 2.6.27

When pairing two Android devices which are supported by Bluez on
kernel 2.6.27, it will always fail if the user can't finish the whole
procedure in 10 seconds. After some analysis we found the root cause
is that Bluez's HCI link's time out timer is set to 10s in the kernel,
and in Bluez's create_bonding() function it calls l2raw_connect() to
create only HCI link without L2CAP channel.

One easy way to fix this issue is to create L2CAP link when creating
bonding, but this is not a final solution, because
according to Bluetooth Specification, creating L2CAP link is only
optional in the bonding establishment procedure, so the thorough way
to fix it is to alter the HCI link's time out timer when handling
bonding request.

Does anyone know has this been fixed on Bluez kernel's patch on
2.6.27, or on the 2.6.29 and later's kernel?

Thanks,
Zhu Lan