Remove unneeded set_connectable adapter_ops callback
diff --git a/plugins/hciops.c b/plugins/hciops.c
index d1906b9..7b502d9 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -2475,25 +2475,6 @@
return err;
}
-static int hciops_set_connectable(int index, gboolean connectable)
-{
- struct dev_info *dev = &devs[index];
- uint8_t mode;
-
- if (connectable)
- mode = SCAN_PAGE;
- else
- mode = 0x00;
-
- DBG("hci%d connectable %d", index, connectable);
-
- if (hci_send_cmd(dev->sk, OGF_HOST_CTL,
- OCF_WRITE_SCAN_ENABLE, 1, &mode) < 0)
- return -errno;
-
- return 0;
-}
-
static int hciops_set_dev_class(int index, uint8_t major, uint8_t minor)
{
struct dev_info *dev = &devs[index];
@@ -3168,7 +3149,6 @@
.setup = hciops_setup,
.cleanup = hciops_cleanup,
.set_powered = hciops_set_powered,
- .set_connectable = hciops_set_connectable,
.set_discoverable = hciops_set_discoverable,
.set_pairable = hciops_set_pairable,
.set_limited_discoverable = hciops_set_limited_discoverable,
diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index ff982e8..d6252cd 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -527,12 +527,6 @@
}
}
-static int mgmt_set_connectable(int index, gboolean connectable)
-{
- DBG("index %d connectable %d", index, connectable);
- return -ENOSYS;
-}
-
static int mgmt_set_dev_class(int index, uint8_t major, uint8_t minor)
{
DBG("index %d major %u minor %u", index, major, minor);
@@ -808,7 +802,6 @@
.setup = mgmt_setup,
.cleanup = mgmt_cleanup,
.set_powered = mgmt_set_powered,
- .set_connectable = mgmt_set_connectable,
.set_discoverable = mgmt_set_discoverable,
.set_pairable = mgmt_set_pairable,
.set_limited_discoverable = mgmt_set_limited_discoverable,
diff --git a/src/adapter.c b/src/adapter.c
index b7a65dc..eef8a06 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -360,7 +360,7 @@
adapter->discov_timeout_id = 0;
- adapter_ops->set_connectable(adapter->dev_id, TRUE);
+ adapter_ops->set_discoverable(adapter->dev_id, FALSE);
return FALSE;
}
@@ -429,7 +429,7 @@
int err;
if (mode == MODE_CONNECTABLE)
- err = adapter_ops->set_connectable(adapter->dev_id, TRUE);
+ err = adapter_ops->set_discoverable(adapter->dev_id, FALSE);
else
err = adapter_ops->set_discoverable(adapter->dev_id, TRUE);
diff --git a/src/adapter.h b/src/adapter.h
index a655cdb..9f53c64 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -199,7 +199,6 @@
int (*setup) (void);
void (*cleanup) (void);
int (*set_powered) (int index, gboolean powered);
- int (*set_connectable) (int index, gboolean connectable);
int (*set_discoverable) (int index, gboolean discoverable);
int (*set_pairable) (int index, gboolean pairable);
int (*set_limited_discoverable) (int index, gboolean limited);
