linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Frédéric Danis" <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v7 05/16] adapter: Move pairable read to load_config()
Date: Wed, 24 Oct 2012 16:34:07 +0200	[thread overview]
Message-ID: <1351089258-25179-6-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1351089258-25179-1-git-send-email-frederic.danis@linux.intel.com>

---
 src/adapter.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 310d1cf..d0a8404 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2499,6 +2499,10 @@ static void load_config(struct btd_adapter *adapter)
 
 	/* Set class */
 	adapter->dev_class = main_opts.class;
+
+	/* Get pairable mode */
+	if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
+		adapter->pairable = TRUE;
 }
 
 gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
@@ -2526,10 +2530,6 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
 	clear_blocked(adapter);
 	load_devices(adapter);
 
-	/* Set pairable mode */
-	if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
-		adapter->pairable = TRUE;
-
 	/* retrieve the active connections: address the scenario where
 	 * the are active connections before the daemon've started */
 	load_connections(adapter);
-- 
1.7.9.5


  parent reply	other threads:[~2012-10-24 14:34 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-24 14:34 [PATCH v7 00/16] Move storage config and names files to ini-file format Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 01/16] doc: Add settings storage documentation Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 02/16] adapter: Read name in storage at init Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 03/16] adaptername: Retrieve config name from adapter Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 04/16] adapter: Remove device class storage Frédéric Danis
2012-10-24 14:34 ` Frédéric Danis [this message]
2012-10-24 14:34 ` [PATCH v7 06/16] adapter: Read pairable timeout in storage at init Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 07/16] adapter: Read discoverable " Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 08/16] adapter: Read mode " Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 09/16] adapter: Move saved config to ini-file format Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 10/16] TODO: Add entry to remove storage convertion function Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 11/16] adapter: Move storage names to cache directory Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 12/16] event: Remove write of LastSeen info Frédéric Danis
2012-10-24 14:34 ` [PATCH v7 13/16] device: Retrieve name from cache directory Frédéric Danis
2012-10-25  9:52   ` Johan Hedberg
2012-10-24 14:34 ` [PATCH v7 14/16] dbusoob: Store device name in " Frédéric Danis
2012-10-25  9:54   ` Johan Hedberg
2012-10-24 14:34 ` [PATCH v7 15/16] input: Retrieve device name from " Frédéric Danis
2012-10-25  9:55   ` Johan Hedberg
2012-10-24 14:34 ` [PATCH v7 16/16] hcitool: Retrieve names " Frédéric Danis
2012-10-25  9:55   ` Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1351089258-25179-6-git-send-email-frederic.danis@linux.intel.com \
    --to=frederic.danis@linux.intel.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).