Remove unneeded adapter_ops->request_authentication callback
diff --git a/plugins/hciops.c b/plugins/hciops.c
index eea0844..ecfcec3 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -3178,29 +3178,6 @@
return 0;
}
-static int hciops_request_authentication(int index, bdaddr_t *bdaddr)
-{
- struct dev_info *dev = &devs[index];
- auth_requested_cp cp;
- uint16_t handle;
- int err;
-
- DBG("hci%d", index);
-
- err = get_handle(index, bdaddr, &handle);
- if (err < 0)
- return err;
-
- memset(&cp, 0, sizeof(cp));
- cp.handle = htobs(handle);
-
- if (hci_send_cmd(dev->sk, OGF_LINK_CTL, OCF_AUTH_REQUESTED,
- AUTH_REQUESTED_CP_SIZE, &cp) < 0)
- return -errno;
-
- return 0;
-}
-
static int hciops_pincode_reply(int index, bdaddr_t *bdaddr, const char *pin)
{
struct dev_info *dev = &devs[index];
@@ -3466,6 +3443,29 @@
return 0;
}
+static int request_authentication(int index, bdaddr_t *bdaddr)
+{
+ struct dev_info *dev = &devs[index];
+ auth_requested_cp cp;
+ uint16_t handle;
+ int err;
+
+ DBG("hci%d", index);
+
+ err = get_handle(index, bdaddr, &handle);
+ if (err < 0)
+ return err;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.handle = htobs(handle);
+
+ if (hci_send_cmd(dev->sk, OGF_LINK_CTL, OCF_AUTH_REQUESTED,
+ AUTH_REQUESTED_CP_SIZE, &cp) < 0)
+ return -errno;
+
+ return 0;
+}
+
static void bonding_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
{
struct bt_conn *conn = user_data;
@@ -3481,7 +3481,7 @@
/* Wait proper error to be propagated by bonding complete */
return;
- if (hciops_request_authentication(dev->id, &conn->bdaddr) < 0)
+ if (request_authentication(dev->id, &conn->bdaddr) < 0)
goto failed;
return;
@@ -3572,7 +3572,6 @@
.read_local_features = hciops_read_local_features,
.disconnect = hciops_disconnect,
.remove_bonding = hciops_remove_bonding,
- .request_authentication = hciops_request_authentication,
.pincode_reply = hciops_pincode_reply,
.confirm_reply = hciops_confirm_reply,
.passkey_reply = hciops_passkey_reply,
diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index f9a75a5..a621a22 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -1449,16 +1449,6 @@
return 0;
}
-static int mgmt_request_authentication(int index, bdaddr_t *bdaddr)
-{
- char addr[18];
-
- ba2str(bdaddr, addr);
- DBG("index %d %s", index, addr);
-
- return -ENOSYS;
-}
-
static int mgmt_confirm_reply(int index, bdaddr_t *bdaddr, gboolean success)
{
char addr[18];
@@ -1638,7 +1628,6 @@
.read_local_features = mgmt_read_local_features,
.disconnect = mgmt_disconnect,
.remove_bonding = mgmt_remove_bonding,
- .request_authentication = mgmt_request_authentication,
.pincode_reply = mgmt_pincode_reply,
.confirm_reply = mgmt_confirm_reply,
.passkey_reply = mgmt_passkey_reply,
diff --git a/src/adapter.c b/src/adapter.c
index fb5bc78..08098a5 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3598,12 +3598,6 @@
return adapter_ops->remove_bonding(adapter->dev_id, bdaddr);
}
-int btd_adapter_request_authentication(struct btd_adapter *adapter,
- bdaddr_t *bdaddr)
-{
- return adapter_ops->request_authentication(adapter->dev_id, bdaddr);
-}
-
int btd_adapter_pincode_reply(struct btd_adapter *adapter, bdaddr_t *bdaddr,
const char *pin)
{
diff --git a/src/adapter.h b/src/adapter.h
index 18359a9..1edc441 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -221,7 +221,6 @@
int (*read_local_features) (int index, uint8_t *features);
int (*disconnect) (int index, bdaddr_t *bdaddr);
int (*remove_bonding) (int index, bdaddr_t *bdaddr);
- int (*request_authentication) (int index, bdaddr_t *bdaddr);
int (*pincode_reply) (int index, bdaddr_t *bdaddr, const char *pin);
int (*confirm_reply) (int index, bdaddr_t *bdaddr, gboolean success);
int (*passkey_reply) (int index, bdaddr_t *bdaddr, uint32_t passkey);
@@ -270,9 +269,6 @@
int btd_adapter_remove_bonding(struct btd_adapter *adapter, bdaddr_t *bdaddr);
-int btd_adapter_request_authentication(struct btd_adapter *adapter,
- bdaddr_t *bdaddr);
-
int btd_adapter_pincode_reply(struct btd_adapter *adapter, bdaddr_t *bdaddr,
const char *pin);
int btd_adapter_confirm_reply(struct btd_adapter *adapter, bdaddr_t *bdaddr,
