2015-06-08 12:28:41

by Loic Poulain

Subject: [PATCHv2 2/2] Bluetooth: Reorder HCI user channel socket release

The hci close method needs to know if we are in user channel context.
Only add the index to mgmt once close is performed.

Signed-off-by: Loic Poulain <[email protected]>
---
v2: Rebase on d24d81444f8 (HCI_UP test)
net/bluetooth/hci_core.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index f6c9909..573711c 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1553,6 +1553,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
BT_DBG("%s %p", hdev->name, hdev);

if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
+ !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
test_bit(HCI_UP, &hdev->flags)) {
/* Execute vendor specific shutdown routine */
if (hdev->shutdown)
--
1.9.1

2015-06-09 09:37:22

by Loic Poulain

Subject: RE: [PATCHv2 2/2] Bluetooth: Reorder HCI user channel socket release

Oops, you're right.

Regards,
Loic
________________________________________
From: Marcel Holtmann [[email protected]]
Sent: Tuesday, June 09, 2015 9:32 AM
To: Poulain, Loic
Cc: [email protected]
Subject: Re: [PATCHv2 2/2] Bluetooth: Reorder HCI user channel socket release

Hi Loic,

> The hci close method needs to know if we are in user channel context.
> Only add the index to mgmt once close is performed.
>
> Signed-off-by: Loic Poulain <[email protected]>
> ---
> v2: Rebase on d24d81444f8 (HCI_UP test)
> net/bluetooth/hci_core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index f6c9909..573711c 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -1553,6 +1553,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
> BT_DBG("%s %p", hdev->name, hdev);
>
> if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
> + !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
> test_bit(HCI_UP, &hdev->flags)) {
> /* Execute vendor specific shutdown routine */
> if (hdev->shutdown)

are you sure that this is the correct commit message. It sounds like you copied the one from patch 1/2.

Regards

Marcel

2015-06-09 07:32:41

by Marcel Holtmann

Subject: Re: [PATCHv2 2/2] Bluetooth: Reorder HCI user channel socket release

Hi Loic,

> The hci close method needs to know if we are in user channel context.
> Only add the index to mgmt once close is performed.
>
> Signed-off-by: Loic Poulain <[email protected]>
> ---
> v2: Rebase on d24d81444f8 (HCI_UP test)
> net/bluetooth/hci_core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index f6c9909..573711c 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -1553,6 +1553,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
> BT_DBG("%s %p", hdev->name, hdev);
>
> if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
> + !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
> test_bit(HCI_UP, &hdev->flags)) {
> /* Execute vendor specific shutdown routine */
> if (hdev->shutdown)

are you sure that this is the correct commit message. It sounds like you copied the one from patch 1/2.

Regards

Marcel