Bluetooth: Remove adv set for directed advertising

Extended advertising Data is set during bluetooth initialization
by default which causes InvalidHCICommandParameters when setting
Extended advertising parameters.

As per Core Spec 5.2 Vol 2, PART E, Sec 7.8.53, for
advertising_event_property LE_LEGACY_ADV_DIRECT_IND does not
supports advertising data when the advertising set already
contains some, the controller shall return erroc code
'InvalidHCICommandParameters(0x12).

So it is required to remove adv set for handle 0x00. since we use
instance 0 for directed adv.

Signed-off-by: Sathish Narsimman <sathish.narasimman@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index d878bf8dce2061f80ce745e99dfa84b9679334b0..29b638c6c934cf2522152abd7bce3187fa69830d 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1724,6 +1724,8 @@ struct hci_cp_le_set_ext_scan_rsp_data {
 
 #define LE_SET_ADV_DATA_NO_FRAG                0x01
 
+#define HCI_OP_LE_REMOVE_ADV_SET       0x203c
+
 #define HCI_OP_LE_CLEAR_ADV_SETS       0x203d
 
 #define HCI_OP_LE_SET_ADV_SET_RAND_ADDR        0x2035

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index a582c676e584c9de6c2a3a297827d935566109a6..2731f0ad2a903b3e881c37baf10353c0499f88ff 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -898,6 +898,16 @@ static void hci_req_directed_advertising(struct hci_request *req,
                cp.peer_addr_type = conn->dst_type;
                bacpy(&cp.peer_addr, &conn->dst);
 
+               /* As per Core Spec 5.2 Vol 2, PART E, Sec 7.8.53, for
+                * advertising_event_property LE_LEGACY_ADV_DIRECT_IND
+                * does not supports advertising data when the advertising set already
+                * contains some, the controller shall return erroc code 'Invalid
+                * HCI Command Parameters(0x12).
+                * So it is required to remove adv set for handle 0x00. since we use
+                * instance 0 for directed adv.
+                */
+               hci_req_add(req, HCI_OP_LE_REMOVE_ADV_SET, sizeof(cp.handle), &cp.handle);
+
                hci_req_add(req, HCI_OP_LE_SET_EXT_ADV_PARAMS, sizeof(cp), &cp);
 
                if (own_addr_type == ADDR_LE_DEV_RANDOM &&