Return-Path: Date: Tue, 15 Nov 2011 08:45:47 -0800 (PST) From: Mat Martineau To: Emeltchenko Andrei cc: linux-bluetooth@vger.kernel.org, pkrystad@codeaurora.org Subject: Re: [PATCH] Bluetooth: Assure BREDR HCI device first in the list In-Reply-To: <1321361939-24024-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> Message-ID: References: <1321361939-24024-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Andrei - On Tue, 15 Nov 2011, Emeltchenko Andrei wrote: > From: Andrei Emeltchenko > > Using different list_add to make sure that BR/EDR HCI device is the > first device in the hci_dev_list. This is needed for e.g. A2MP Discover > Command which requires that "entry for Controller ID 0x00 (Primary > BR/EDR controller) shall always be sent and shall be the first entry > in the Controller List. > Also output from hciconfig looks nicer :-) > > Signed-off-by: Andrei Emeltchenko > --- > net/bluetooth/hci_core.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > index 02a6f15..bf24218 100644 > --- a/net/bluetooth/hci_core.c > +++ b/net/bluetooth/hci_core.c > @@ -1501,7 +1501,11 @@ int hci_register_dev(struct hci_dev *hdev) > > sprintf(hdev->name, "hci%d", id); > hdev->id = id; > - list_add(&hdev->list, head); > + > + if (hdev->dev_type == HCI_BREDR) > + list_add(&hdev->list, head); > + else > + list_add_tail(&hdev->list, head); > > atomic_set(&hdev->refcnt, 1); > spin_lock_init(&hdev->lock); > -- > 1.7.4.1 I'm don't think it works to depend on the ordering in hdev->list for A2MP discover, since there might be multiple BR/EDR controllers. Controller 0x00 is the BR/EDR controller that received the A2MP discover request. The rest of the list should be only AMP controllers, any other BR/EDR controllers should not be listed. In practice, this means that the 0x00 entry in the list is hard-coded and hdev->list is only used to look for AMP controllers. -- Mat Martineau Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum