Return-Path: Message-ID: <1337202331.5970.269.camel@aeonflux> Subject: Re: [PATCH v2] Bluetooth: Use hci_conn data to handle failed LE Connection Complete From: Marcel Holtmann To: Andrzej Kaczmarek Cc: linux-bluetooth@vger.kernel.org Date: Wed, 16 May 2012 14:05:31 -0700 In-Reply-To: <1337201737-5983-1-git-send-email-andrzej.kaczmarek@tieto.com> References: <1337201737-5983-1-git-send-email-andrzej.kaczmarek@tieto.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Andrzej, > This patch changes way LE Connection Complete event with error status are > handled by reusing peer information stored in hci_conn instead of these > returned in event packet which may not be always valid. > > LE Connection Complete event for failed (cancelled) connection does not > include peer address on some Bluetooth chips and only status parameter is > filled. In such case appriopriate hci_conn is not removed and subsequent > connections to given peer won't be possible. > > 2012-05-07 11:21:39.133378 < HCI Command: LE Create Connection (0x08|0x000d) plen 25 > bdaddr 00:22:D0:10:13:EE type 1 > 2012-05-07 11:21:39.138774 > HCI Event: Command Status (0x0f) plen 4 > LE Create Connection (0x08|0x000d) status 0x00 ncmd 1 > 2012-05-07 11:21:44.752854 < HCI Command: LE Create Connection Cancel (0x08|0x000e) plen 0 > 2012-05-07 11:21:44.759475 > HCI Event: Command Complete (0x0e) plen 4 > LE Create Connection Cancel (0x08|0x000e) ncmd 1 > 2012-05-07 11:21:44.764479 > HCI Event: LE Meta Event (0x3e) plen 19 > LE Connection Complete > status 0x02 handle 0, role master > bdaddr 00:00:00:00:00:00 (Public) > > [14898.739425] [6603] hci_connect: hci0 dst 00:22:D0:10:13:EE > [14898.739429] [6603] hci_conn_add: hci0 dst 00:22:D0:10:13:EE > [14898.739434] [6603] hci_conn_init_sysfs: conn ffff880079f03000 > [14898.739440] [6603] hci_send_cmd: hci0 opcode 0x200d plen 25 > [14898.739443] [6603] hci_send_cmd: skb len 28 > [14898.739487] [6603] hci_chan_create: hci0 conn ffff880079f03000 > ... > [14938.860231] [55] hci_send_cmd: hci0 opcode 0x200e plen 0 > ... > [14938.876427] [55] hci_le_conn_complete_evt: hci0 status 2 > [14938.876433] [55] hci_conn_add: hci0 dst 00:00:00:00:00:00 > [14938.876439] [55] hci_conn_init_sysfs: conn ffff88007aeff800 > [14938.876454] [55] hci_send_to_control: len 14 > [14938.876470] [55] l2cap_connect_cfm: hcon ffff88007aeff800 bdaddr 00:00:00:00:00:00 status 2 > [14938.876474] [55] hci_conn_del: hci0 conn ffff88007aeff800 handle 0 > > Signed-off-by: Andrzej Kaczmarek > Acked-by: Andre Guedes > --- > net/bluetooth/hci_event.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 4eefb7f..d9ec0e8 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -3307,6 +3307,19 @@ static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff > > hci_dev_lock(hdev); > > + if (ev->status) { > + conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT); > + if (!conn) > + goto unlock; > + > + mgmt_connect_failed(hdev, &conn->dst, conn->type, > + conn->dst_type, ev->status); > + hci_proto_connect_cfm(conn, ev->status); > + conn->state = BT_CLOSED; > + hci_conn_del(conn); > + goto unlock; > + } > + > conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &ev->bdaddr); > if (!conn) { > conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr); this change is wrong. We are now treating every single adapter as being broken. That is not acceptable. We should only add a tweak if the BD_ADDR parameter is BDADDR_ANY and not as a general rule. In addition if we do this, we need to print a warning to dmesg to make this known. I also like to clearly state in the commit message which manufactures have these broken adapters. Regards Marcel