Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: files/src/device.c

Issue 992006: Changed DisableTechnology to do a full device disable. (Closed)
Patch Set: Use set_carrier, not set_powered, and move to device_disable. Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * 2 *
3 * Connection Manager 3 * Connection Manager
4 * 4 *
5 * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. 5 * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10 * 10 *
(...skipping 1249 matching lines...) Expand 10 before | Expand all | Expand 10 after
1260 if (device->powered == FALSE) 1260 if (device->powered == FALSE)
1261 return -ENOLINK; 1261 return -ENOLINK;
1262 if (device->powered_pending == FALSE) 1262 if (device->powered_pending == FALSE)
1263 return -EALREADY; 1263 return -EALREADY;
1264 1264
1265 device->powered_pending = FALSE; 1265 device->powered_pending = FALSE;
1266 1266
1267 clear_scan_trigger(device); 1267 clear_scan_trigger(device);
1268 g_hash_table_remove_all(device->networks); 1268 g_hash_table_remove_all(device->networks);
1269 1269
1270 set_carrier(device, FALSE);
1270 err = device->driver->disable(device); 1271 err = device->driver->disable(device);
1271 if (err < 0) 1272 if (err < 0)
1272 return err; 1273 return err;
1273 1274
1274 device->powered = FALSE; 1275 device->powered = FALSE;
1275 1276
1276 type = __connman_device_get_service_type(device); 1277 type = __connman_device_get_service_type(device);
1277 __connman_notifier_disable(type); 1278 __connman_notifier_disable(type);
1278 return 0; 1279 return 0;
1279 } 1280 }
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
1853 connman_error("%s: failed to register storage", __func__); 1854 connman_error("%s: failed to register storage", __func__);
1854 return connman_driver_register(&device_driver); 1855 return connman_driver_register(&device_driver);
1855 } 1856 }
1856 1857
1857 void __connman_device_cleanup(void) 1858 void __connman_device_cleanup(void)
1858 { 1859 {
1859 connman_driver_unregister(&device_driver); 1860 connman_driver_unregister(&device_driver);
1860 connman_storage_unregister(&device_storage); 1861 connman_storage_unregister(&device_storage);
1861 dbus_connection_unref(connection); 1862 dbus_connection_unref(connection);
1862 } 1863 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698