From 2abdb94e81201017d97cf664345fa57b387ce311 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 19 Dec 2012 17:31:50 +0100
Subject: [PATCH] core: Remove PageTimeout configuration option

The PageTimeout setting is currently not supported. So do not pretend
that it is actually available.
---
 src/hcid.h    |  6 ------
 src/main.c    | 11 -----------
 src/main.conf |  4 ----
 3 files changed, 21 deletions(-)

diff --git a/src/hcid.h b/src/hcid.h
index 5752da9d8..3dfaf10cf 100644
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -25,10 +25,8 @@
 
 struct main_opts {
 	char		host_name[40];
-	unsigned long	flags;
 	char		*name;
 	uint32_t	class;
-	uint16_t	pageto;
 	uint16_t	autoto;
 	uint32_t	discovto;
 	uint32_t	pairto;
@@ -44,10 +42,6 @@ struct main_opts {
 	uint16_t	did_version;
 };
 
-enum {
-	HCID_SET_PAGETO,
-};
-
 extern struct main_opts main_opts;
 
 gboolean plugin_init(const char *enable, const char *disable);
diff --git a/src/main.c b/src/main.c
index 7922222c7..01f5d222e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -71,7 +71,6 @@ static const char * const supported_options[] = {
 	"Class",
 	"DiscoverableTimeout",
 	"PairableTimeout",
-	"PageTimeout",
 	"AutoConnectTimeout",
 	"DeviceID",
 	"ReverseServiceDiscovery",
@@ -201,16 +200,6 @@ static void parse_config(GKeyFile *config)
 		main_opts.pairto = val;
 	}
 
-	val = g_key_file_get_integer(config, "General", "PageTimeout", &err);
-	if (err) {
-		DBG("%s", err->message);
-		g_clear_error(&err);
-	} else {
-		DBG("pageto=%d", val);
-		main_opts.pageto = val;
-		main_opts.flags |= 1 << HCID_SET_PAGETO;
-	}
-
 	val = g_key_file_get_integer(config, "General", "AutoConnectTimeout",
 									&err);
 	if (err) {
diff --git a/src/main.conf b/src/main.conf
index 8bb82f672..d605ef4d0 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -19,10 +19,6 @@ DiscoverableTimeout = 0
 # 0 = disable timer, i.e. stay pairable forever
 PairableTimeout = 0
 
-# Use some other page timeout than the controller default one
-# which is 16384 (10 seconds).
-PageTimeout = 8192
-
 # Automatic connection for bonded devices driven by platform/user events.
 # If a platform plugin uses this mechanism, automatic connections will be
 # enabled during the interval defined below. Initially, this feature
-- 
2.47.3