From: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Date: Fri, 14 Oct 2022 07:02:19 +0000 (+0900)
Subject: Bluetooth : fix build error
X-Git-Tag: accepted/tizen/unified/20230118.172025~226
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52b357e4fc7eee1fb0f9d6842d58441ed1cae495;p=platform%2Fkernel%2Flinux-rpi.git

Bluetooth : fix build error

Update device name on remote_name_event, Fix interface define for
build error.

Change-Id: I59df4a7e30f9a83a0efdce516b2a325cb3b0983b
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
---

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 7da3a6c..93792f3 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2297,7 +2297,7 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,
 	if (conn &&
 	    (conn->state == BT_CONFIG || conn->state == BT_CONNECTED)) {
 		if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
-			mgmt_device_connected(hdev, conn, 0, name, name_len);
+			mgmt_device_connected(hdev, conn, name, name_len);
 		else
 			mgmt_device_name_update(hdev, bdaddr, name, name_len);
 	}
@@ -3186,7 +3186,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 	hci_conn_del(conn);
 
 #ifdef TIZEN_BT
-	if (type == ACL_LINK && !hci_conn_num(hdev, ACL_LINK)) {
+	if (conn->type == ACL_LINK && !hci_conn_num(hdev, ACL_LINK)) {
 		int iscan;
 		int pscan;
 
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ad7709c..d67ff88 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6493,7 +6493,7 @@ static int add_white_list(struct sock *sk, struct hci_dev *hdev,
 
 	hci_req_init(&req, hdev);
 
-	hci_req_add(&req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(*cp), cp);
+	hci_req_add(&req, HCI_OP_LE_ADD_TO_ACCEPT_LIST, sizeof(*cp), cp);
 
 	err = hci_req_run(&req, add_white_list_complete);
 	if (err < 0) {
@@ -6576,7 +6576,7 @@ static int remove_from_white_list(struct sock *sk, struct hci_dev *hdev,
 
 	hci_req_init(&req, hdev);
 
-	hci_req_add(&req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(*cp), cp);
+	hci_req_add(&req, HCI_OP_LE_DEL_FROM_ACCEPT_LIST, sizeof(*cp), cp);
 
 	err = hci_req_run(&req, remove_from_white_list_complete);
 	if (err < 0) {
@@ -6654,7 +6654,7 @@ static int clear_white_list(struct sock *sk, struct hci_dev *hdev,
 
 	hci_req_init(&req, hdev);
 
-	hci_req_add(&req, HCI_OP_LE_CLEAR_WHITE_LIST, 0, NULL);
+	hci_req_add(&req, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL);
 
 	err = hci_req_run(&req, clear_white_list_complete);
 	if (err < 0) {