diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
| commit | 17370895fde2d210bb50dfaa1c89fe6601de3467 (patch) | |
| tree | 2797d5e061b7948a53f270f9ccfcc31b1c0ad6f5 /network/manager.c | |
| parent | fa141e676e82cd20082779c086d1fef6427fdc20 (diff) | |
| parent | 393416b170d6e4b2b7406418d63c7be2aefda70f (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
Diffstat (limited to 'network/manager.c')
| -rw-r--r-- | network/manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/network/manager.c b/network/manager.c index c9555285..cafb7442 100644 --- a/network/manager.c +++ b/network/manager.c @@ -368,7 +368,6 @@ int network_manager_init(DBusConnection *conn) return -1; /* Register PANU, GN and NAP servers if they don't exist */ - /* FIXME: server should be registered as adapter driver */ btd_register_adapter_driver(&network_panu_server_driver); btd_register_adapter_driver(&network_gn_server_driver); btd_register_adapter_driver(&network_nap_server_driver); @@ -397,6 +396,10 @@ void network_manager_exit(void) connection_exit(); } + btd_unregister_adapter_driver(&network_panu_server_driver); + btd_unregister_adapter_driver(&network_gn_server_driver); + btd_unregister_adapter_driver(&network_nap_server_driver); + dbus_connection_unref(connection); connection = NULL; |