1 files changed, 7 insertions, 7 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d57c11c1c6b5..c162af5d16bf 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1183,7 +1183,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
                         hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
                 else if (!hci_dev_test_flag(hdev, HCI_LE_ADV) &&
                          hdev->discovery.state == DISCOVERY_FINDING)
-                        mgmt_reenable_advertising(hdev);
+                        hci_req_reenable_advertising(hdev);
 
                 break;
 
@@ -2176,7 +2176,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
                         hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES,
                                      sizeof(cp), &cp);
 
-                        hci_update_page_scan(hdev);
+                        hci_req_update_scan(hdev);
                 }
 
                 /* Set packet type for incoming connection */
@@ -2362,7 +2362,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
                 if (test_bit(HCI_CONN_FLUSH_KEY, &conn->flags))
                         hci_remove_link_key(hdev, &conn->dst);
 
-                hci_update_page_scan(hdev);
+                hci_req_update_scan(hdev);
         }
 
         params = hci_conn_params_lookup(hdev, &conn->dst, conn->dst_type);
@@ -2401,7 +2401,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
          * is timed out due to Directed Advertising."
          */
         if (type == LE_LINK)
-                mgmt_reenable_advertising(hdev);
+                hci_req_reenable_advertising(hdev);
 
 unlock:
         hci_dev_unlock(hdev);
@@ -3833,9 +3833,9 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
                 data.ssp_mode           = 0x01;
 
                 if (hci_dev_test_flag(hdev, HCI_MGMT))
-                        name_known = eir_has_data_type(info->data,
-                                                       sizeof(info->data),
-                                                       EIR_NAME_COMPLETE);
+                        name_known = eir_get_data(info->data,
+                                                  sizeof(info->data),
+                                                  EIR_NAME_COMPLETE, NULL);
                 else
                         name_known = true;