T630 Logitech Bluetooth Mouse not re-connect after disconnect

[Takanori Watanabe]

In message <CAAVaLNeq2H_aU0e_+bwOnz06tTZtWEndyDVrhfiNRhsH5HhRHg at mail.gmail.com>
, Claudius Chan $B$5$s$$$o$/(B:
>Hi FreeBSD Bluetooth team,
>
>
>I currently running FreeBSD-current r279881 and appreciate the quality and
>stability of the FreeBSD. It would be perfect if my mouse working
>flawlessly.
>
>
>I have issue with my T630 bluetooth mouse to my X1 Carbon Laptop. Every
>time the mouse disconnect (turn off/on) or wake up OS wake up from sleep,
>the mouse just can't re-connect. I have to set my mouse to discover mode
>and re-connect the mouse. I tried with another bluetooth mouse(sony
>bluetooth mouse) is working fine. Not sure what went wrong.
>
>The following steps is what I done in order to reconnect the mouse:
>
>1. Set the mouse to discover mode
>
>2. Stop bthidd daemon
>
>3. run the commad: sudo bthidcontrol -a logitech-mouse forget
>
>4. start the bthidd daemon and doing mouse activity such as click or moving
>mouse.
>

I found a bug on my change.
How about this patch ?

Index: ng_l2cap_ulpi.c
===================================================================
--- ng_l2cap_ulpi.c	(revision 285236)
+++ ng_l2cap_ulpi.c	(working copy)
@@ -398,6 +398,7 @@
 		ip->lcid = ch->scid;
 		ip->psm = ch->psm;
 		ip->ident = ch->ident;
+		ip->linktype = ch->con->linktype;
 
 		NG_SEND_MSG_HOOK(error, l2cap->node, msg, l2cap->l2c, 0);
 	}