From 239d3076fff1025dfcdc6b85aed7d32a61c32519 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 11 Jul 2013 11:30:55 +0300
Subject: [PATCH] core: Remove unnecessary secure paramter from
 device_browse_primary

---
 src/device.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/device.c b/src/device.c
index a0bc78c50..1a9933467 100644
--- a/src/device.c
+++ b/src/device.c
@@ -219,8 +219,7 @@ static const uint16_t uuid_list[] = {
 	0
 };
 
-static int device_browse_primary(struct btd_device *device, DBusMessage *msg,
-							gboolean secure);
+static int device_browse_primary(struct btd_device *device, DBusMessage *msg);
 static int device_browse_sdp(struct btd_device *device, DBusMessage *msg);
 
 static GSList *find_service_with_profile(GSList *list, struct btd_profile *p)
@@ -1224,7 +1223,7 @@ static int device_resolve_svc(struct btd_device *dev, DBusMessage *msg)
 	if (device_is_bredr(dev))
 		return device_browse_sdp(dev, msg);
 	else
-		return device_browse_primary(dev, msg, FALSE);
+		return device_browse_primary(dev, msg);
 }
 
 static struct btd_service *find_connectable_service(struct btd_device *dev,
@@ -3255,7 +3254,7 @@ done:
 
 	if (device->connect) {
 		if (!device->svc_resolved)
-			device_browse_primary(device, NULL, FALSE);
+			device_browse_primary(device, NULL);
 
 		if (err < 0)
 			reply = btd_error_failed(device->connect,
@@ -3391,13 +3390,11 @@ static void att_browse_cb(gpointer user_data)
 							device->browse);
 }
 
-static int device_browse_primary(struct btd_device *device, DBusMessage *msg,
-								gboolean secure)
+static int device_browse_primary(struct btd_device *device, DBusMessage *msg)
 {
 	struct btd_adapter *adapter = device->adapter;
 	struct att_callbacks *attcb;
 	struct browse_req *req;
-	BtIOSecLevel sec_level;
 
 	if (device->browse)
 		return -EBUSY;
@@ -3412,8 +3409,6 @@ static int device_browse_primary(struct btd_device *device, DBusMessage *msg,
 		goto done;
 	}
 
-	sec_level = secure ? BT_IO_SEC_HIGH : BT_IO_SEC_LOW;
-
 	attcb = g_new0(struct att_callbacks, 1);
 	attcb->error = att_browse_error_cb;
 	attcb->success = att_browse_cb;
@@ -3426,7 +3421,7 @@ static int device_browse_primary(struct btd_device *device, DBusMessage *msg,
 				BT_IO_OPT_DEST_BDADDR, &device->bdaddr,
 				BT_IO_OPT_DEST_TYPE, device->bdaddr_type,
 				BT_IO_OPT_CID, ATT_CID,
-				BT_IO_OPT_SEC_LEVEL, sec_level,
+				BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
 				BT_IO_OPT_INVALID);
 
 	if (device->att_io == NULL) {
@@ -3645,7 +3640,7 @@ static gboolean start_discovery(gpointer user_data)
 	if (device_is_bredr(device))
 		device_browse_sdp(device, NULL);
 	else
-		device_browse_primary(device, NULL, FALSE);
+		device_browse_primary(device, NULL);
 
 	device->discov_timer = 0;
 
@@ -3734,7 +3729,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t status)
 		if (device_is_bredr(device))
 			device_browse_sdp(device, bonding->msg);
 		else
-			device_browse_primary(device, bonding->msg, FALSE);
+			device_browse_primary(device, bonding->msg);
 
 		bonding_request_free(bonding);
 	} else if (!device->svc_resolved) {
@@ -4213,7 +4208,7 @@ void btd_device_gatt_set_service_changed(struct btd_device *device,
 			prim->changed = TRUE;
 	}
 
-	device_browse_primary(device, NULL, FALSE);
+	device_browse_primary(device, NULL);
 }
 
 void btd_device_add_uuid(struct btd_device *device, const char *uuid)
-- 
2.47.3