summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-05-31 16:50:38 +0000
committerMarcel Holtmann <marcel@holtmann.org>2006-05-31 16:50:38 +0000
commitdb145536bc005d0be3f5e3028b1fd47d84364971 (patch)
tree4ecb6b4e38a0f2b69fb06777719d678beb9d90c0
parent79f10bf47a1e3f3d7d1eb7b01425e685f37ab52e (diff)
Don't request remote features (the kernel should do this)
-rw-r--r--hcid/security.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/hcid/security.c b/hcid/security.c
index f26636e9..5ea89294 100644
--- a/hcid/security.c
+++ b/hcid/security.c
@@ -593,34 +593,11 @@ static inline void conn_complete(int dev, int dev_id, bdaddr_t *sba, void *ptr)
&cp, READ_REMOTE_VERSION_CP_SIZE);
hci_req_queue_append(data);
- } else {
- /* skip: remote version found */
+ } else
free(str);
- }
-
- /* check if the remote features needs be requested */
- snprintf(filename, sizeof(filename), "%s/%s/features",
- STORAGEDIR, local_addr);
-
- str = textfile_get(filename, peer_addr);
- if (!str) {
- read_remote_features_cp cp;
-
- cp.handle = evt->handle;
-
- data = hci_req_data_new(dev_id, &evt->bdaddr, OGF_LINK_CTL,
- OCF_READ_REMOTE_FEATURES, EVT_READ_REMOTE_FEATURES_COMPLETE,
- &cp, READ_REMOTE_FEATURES_CP_SIZE);
-
- hci_req_queue_append(data);
- } else {
- /* skip: remote features found */
- free(str);
- }
free(local_addr);
free(peer_addr);
-
}
static inline void disconn_complete(int dev, bdaddr_t *sba, void *ptr)