Diff between 5df433134691d9ce760f4cb672d8f25ba1bc9b2e and 5834e96ad4b0c47c30420072549298f24292c007

Changed Files

File Additions Deletions Status
src/device.c +2 -7 modified
src/device.h +0 -1 modified

Full Patch

diff --git a/src/device.c b/src/device.c
index ad28399..706cb9d 100644
--- a/src/device.c
+++ b/src/device.c
@@ -540,11 +540,6 @@ static void device_free(gpointer user_data)
 	g_free(device);
 }
 
-gboolean device_is_le(struct btd_device *device)
-{
-	return (device->bdaddr_type != BDADDR_BREDR);
-}
-
 gboolean device_is_paired(struct btd_device *device)
 {
 	return device->paired;
@@ -1351,7 +1346,7 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
 {
 	struct btd_device *dev = user_data;
 
-	if (device_is_le(dev)) {
+	if (dev->le) {
 		int err;
 
 		if (btd_device_is_connected(dev))
@@ -1650,7 +1645,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg,
 	 * channel first and only then start pairing (there's code for
 	 * this in the ATT connect callback)
 	 */
-	if (device_is_le(device) && !btd_device_is_connected(device))
+	if (device->le && !btd_device_is_connected(device))
 		err = device_connect_le(device);
 	else
 		err = adapter_create_bonding(adapter, &device->bdaddr,
diff --git a/src/device.h b/src/device.h
index 0789ffd..224f432 100644
--- a/src/device.h
+++ b/src/device.h
@@ -64,7 +64,6 @@ void device_remove_profile(gpointer a, gpointer b);
 struct btd_adapter *device_get_adapter(struct btd_device *device);
 const bdaddr_t *device_get_address(struct btd_device *device);
 const char *device_get_path(const struct btd_device *device);
-gboolean device_is_le(struct btd_device *device);
 gboolean device_is_temporary(struct btd_device *device);
 gboolean device_is_paired(struct btd_device *device);
 gboolean device_is_bonded(struct btd_device *device);