Bluetooth: MGMT: Fix not checking if BT_HS is enabled
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Thu, 6 Aug 2020 18:17:14 +0000 (11:17 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 25 Sep 2020 18:21:55 +0000 (20:21 +0200)
This checks if BT_HS is enabled relecting it on MGMT_SETTING_HS instead
of always reporting it as supported.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/mgmt.c

index 0b711ad..12d7b36 100644 (file)
@@ -784,7 +784,8 @@ static u32 get_supported_settings(struct hci_dev *hdev)
 
                if (lmp_ssp_capable(hdev)) {
                        settings |= MGMT_SETTING_SSP;
-                       settings |= MGMT_SETTING_HS;
+                       if (IS_ENABLED(CONFIG_BT_HS))
+                               settings |= MGMT_SETTING_HS;
                }
 
                if (lmp_sc_capable(hdev))
@@ -1817,6 +1818,10 @@ static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 
        bt_dev_dbg(hdev, "sock %p", sk);
 
+       if (!IS_ENABLED(CONFIG_BT_HS))
+               return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS,
+                                      MGMT_STATUS_NOT_SUPPORTED);
+
        status = mgmt_bredr_support(hdev);
        if (status)
                return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS, status);