提交 a82974c9 编写于 作者: M Marcel Holtmann 提交者: Johan Hedberg

Bluetooth: Don't advertise high speed support without SSP

It is not allowed to enable high speed support when Secure Simple
Pairing is not available or disabled.

However the support for high speed gets advertised on a controller
that does not even support Secure Simple Pairing. Since there is
no way to enable high speed support on such a controller, do not
even advertise its support.
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
上级 3a6afbd2
...@@ -363,9 +363,6 @@ static u32 get_supported_settings(struct hci_dev *hdev) ...@@ -363,9 +363,6 @@ static u32 get_supported_settings(struct hci_dev *hdev)
settings |= MGMT_SETTING_POWERED; settings |= MGMT_SETTING_POWERED;
settings |= MGMT_SETTING_PAIRABLE; settings |= MGMT_SETTING_PAIRABLE;
if (lmp_ssp_capable(hdev))
settings |= MGMT_SETTING_SSP;
if (lmp_bredr_capable(hdev)) { if (lmp_bredr_capable(hdev)) {
settings |= MGMT_SETTING_CONNECTABLE; settings |= MGMT_SETTING_CONNECTABLE;
if (hdev->hci_ver >= BLUETOOTH_VER_1_2) if (hdev->hci_ver >= BLUETOOTH_VER_1_2)
...@@ -373,8 +370,12 @@ static u32 get_supported_settings(struct hci_dev *hdev) ...@@ -373,8 +370,12 @@ static u32 get_supported_settings(struct hci_dev *hdev)
settings |= MGMT_SETTING_DISCOVERABLE; settings |= MGMT_SETTING_DISCOVERABLE;
settings |= MGMT_SETTING_BREDR; settings |= MGMT_SETTING_BREDR;
settings |= MGMT_SETTING_LINK_SECURITY; settings |= MGMT_SETTING_LINK_SECURITY;
if (lmp_ssp_capable(hdev)) {
settings |= MGMT_SETTING_SSP;
settings |= MGMT_SETTING_HS; settings |= MGMT_SETTING_HS;
} }
}
if (lmp_le_capable(hdev)) { if (lmp_le_capable(hdev)) {
settings |= MGMT_SETTING_LE; settings |= MGMT_SETTING_LE;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册