1 files changed, 8 insertions, 3 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a6000823f0ff..3a99f30a3317 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2071,6 +2071,8 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
                         cp.handle = ev->handle;
                         hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES,
                                      sizeof(cp), &cp);
+
+                        hci_update_page_scan(hdev, NULL);
                 }
 
                 /* Set packet type for incoming connection */
@@ -2247,9 +2249,12 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
         mgmt_device_disconnected(hdev, &conn->dst, conn->type, conn->dst_type,
                                 reason, mgmt_connected);
 
-        if (conn->type == ACL_LINK &&
-            test_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
-                hci_remove_link_key(hdev, &conn->dst);
+        if (conn->type == ACL_LINK) {
+                if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
+                        hci_remove_link_key(hdev, &conn->dst);
+
+                hci_update_page_scan(hdev, NULL);
+        }
 
         params = hci_conn_params_lookup(hdev, &conn->dst, conn->dst_type);
         if (params) {