3 files changed, 24 insertions, 0 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 484f24c7a415..4af1a3a4d9b1 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1490,6 +1490,8 @@ struct hci_cp_le_write_def_data_len {
         __le16  tx_time;
 } __packed;
 
+#define HCI_OP_LE_CLEAR_RESOLV_LIST     0x2029
+
 #define HCI_OP_LE_READ_RESOLV_LIST_SIZE 0x202a
 struct hci_rp_le_read_resolv_list_size {
         __u8    status;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 036e14267d0a..ce2447d89ce1 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -720,6 +720,11 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt)
                                     0, NULL);
                 }
 
+                if (hdev->commands[34] & 0x20) {
+                        /* Clear LE Resolving List */
+                        hci_req_add(req, HCI_OP_LE_CLEAR_RESOLV_LIST, 0, NULL);
+                }
+
                 if (hdev->le_features[0] & HCI_LE_DATA_LEN_EXT) {
                         /* Read LE Maximum Data Length */
                         hci_req_add(req, HCI_OP_LE_READ_MAX_DATA_LEN, 0, NULL);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 6ee69a79258f..562e7a854ed6 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1307,6 +1307,19 @@ static void hci_cc_le_write_def_data_len(struct hci_dev *hdev,
         hdev->le_def_tx_time = le16_to_cpu(sent->tx_time);
 }
 
+static void hci_cc_le_clear_resolv_list(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
+{
+        __u8 status = *((__u8 *) skb->data);
+
+        BT_DBG("%s status 0x%2.2x", hdev->name, status);
+
+        if (status)
+                return;
+
+        hci_bdaddr_list_clear(&hdev->le_resolv_list);
+}
+
 static void hci_cc_le_read_resolv_list_size(struct hci_dev *hdev,
                                            struct sk_buff *skb)
 {
@@ -3029,6 +3042,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,
                 hci_cc_le_write_def_data_len(hdev, skb);
                 break;
 
+        case HCI_OP_LE_CLEAR_RESOLV_LIST:
+                hci_cc_le_clear_resolv_list(hdev, skb);
+                break;
+
         case HCI_OP_LE_READ_RESOLV_LIST_SIZE:
                 hci_cc_le_read_resolv_list_size(hdev, skb);
                 break;