Bluetooth: Use ext adv for directed adv
This patch does extended advertising for directed advertising if the controller supportes. Instance 0 is used for directed advertising. Signed-off-by: Jaganath Kanakkassery <jaganathx.kanakkassery@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
45b7749f16
commit
075e40b79f
|
@ -868,35 +868,58 @@ static void hci_req_directed_advertising(struct hci_request *req,
|
||||||
struct hci_conn *conn)
|
struct hci_conn *conn)
|
||||||
{
|
{
|
||||||
struct hci_dev *hdev = req->hdev;
|
struct hci_dev *hdev = req->hdev;
|
||||||
struct hci_cp_le_set_adv_param cp;
|
|
||||||
u8 own_addr_type;
|
u8 own_addr_type;
|
||||||
u8 enable;
|
u8 enable;
|
||||||
|
|
||||||
/* Clear the HCI_LE_ADV bit temporarily so that the
|
if (ext_adv_capable(hdev)) {
|
||||||
* hci_update_random_address knows that it's safe to go ahead
|
struct hci_cp_le_set_ext_adv_params cp;
|
||||||
* and write a new random address. The flag will be set back on
|
|
||||||
* as soon as the SET_ADV_ENABLE HCI command completes.
|
|
||||||
*/
|
|
||||||
hci_dev_clear_flag(hdev, HCI_LE_ADV);
|
|
||||||
|
|
||||||
/* Set require_privacy to false so that the remote device has a
|
memset(&cp, 0, sizeof(cp));
|
||||||
* chance of identifying us.
|
|
||||||
*/
|
|
||||||
if (hci_update_random_address(req, false, conn_use_rpa(conn),
|
|
||||||
&own_addr_type) < 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
memset(&cp, 0, sizeof(cp));
|
cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_DIRECT_IND);
|
||||||
cp.type = LE_ADV_DIRECT_IND;
|
cp.own_addr_type = own_addr_type;
|
||||||
cp.own_address_type = own_addr_type;
|
cp.channel_map = hdev->le_adv_channel_map;
|
||||||
cp.direct_addr_type = conn->dst_type;
|
cp.tx_power = HCI_TX_POWER_INVALID;
|
||||||
bacpy(&cp.direct_addr, &conn->dst);
|
cp.primary_phy = HCI_ADV_PHY_1M;
|
||||||
cp.channel_map = hdev->le_adv_channel_map;
|
cp.secondary_phy = HCI_ADV_PHY_1M;
|
||||||
|
cp.handle = 0; /* Use instance 0 for directed adv */
|
||||||
|
cp.own_addr_type = own_addr_type;
|
||||||
|
cp.peer_addr_type = conn->dst_type;
|
||||||
|
bacpy(&cp.peer_addr, &conn->dst);
|
||||||
|
|
||||||
hci_req_add(req, HCI_OP_LE_SET_ADV_PARAM, sizeof(cp), &cp);
|
hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_PARAMS, sizeof(cp), &cp);
|
||||||
|
|
||||||
enable = 0x01;
|
__hci_req_enable_ext_advertising(req);
|
||||||
hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
|
} else {
|
||||||
|
struct hci_cp_le_set_adv_param cp;
|
||||||
|
|
||||||
|
/* Clear the HCI_LE_ADV bit temporarily so that the
|
||||||
|
* hci_update_random_address knows that it's safe to go ahead
|
||||||
|
* and write a new random address. The flag will be set back on
|
||||||
|
* as soon as the SET_ADV_ENABLE HCI command completes.
|
||||||
|
*/
|
||||||
|
hci_dev_clear_flag(hdev, HCI_LE_ADV);
|
||||||
|
|
||||||
|
/* Set require_privacy to false so that the remote device has a
|
||||||
|
* chance of identifying us.
|
||||||
|
*/
|
||||||
|
if (hci_update_random_address(req, false, conn_use_rpa(conn),
|
||||||
|
&own_addr_type) < 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
memset(&cp, 0, sizeof(cp));
|
||||||
|
cp.type = LE_ADV_DIRECT_IND;
|
||||||
|
cp.own_address_type = own_addr_type;
|
||||||
|
cp.direct_addr_type = conn->dst_type;
|
||||||
|
bacpy(&cp.direct_addr, &conn->dst);
|
||||||
|
cp.channel_map = hdev->le_adv_channel_map;
|
||||||
|
|
||||||
|
hci_req_add(req, HCI_OP_LE_SET_ADV_PARAM, sizeof(cp), &cp);
|
||||||
|
|
||||||
|
enable = 0x01;
|
||||||
|
hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable),
|
||||||
|
&enable);
|
||||||
|
}
|
||||||
|
|
||||||
conn->state = BT_CONNECT;
|
conn->state = BT_CONNECT;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue