The value of the struct connman_device disconnected variable is never
used in the device code or queried from other parts of the code.
The unnecessary connman_device_get_disconnected() function can be
removed, and as the disconnected variable is never used, so can
the connman_device_set_disconnected() function.
---
include/device.h | 4 ----
src/device.c | 35 -----------------------------------
src/network.c | 8 --------
3 files changed, 47 deletions(-)
diff --git a/include/device.h b/include/device.h
index 57b925c..9ac800a 100644
--- a/include/device.h
+++ b/include/device.h
@@ -85,10 +85,6 @@ int connman_device_set_scanning(struct connman_device
*device,
bool connman_device_get_scanning(struct connman_device *device);
void connman_device_reset_scanning(struct connman_device *device);
-int connman_device_set_disconnected(struct connman_device *device,
- bool disconnected);
-bool connman_device_get_disconnected(struct connman_device *device);
-
int connman_device_set_string(struct connman_device *device,
const char *key, const char *value);
const char *connman_device_get_string(struct connman_device *device,
diff --git a/src/device.c b/src/device.c
index d24adc1..188106c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -53,7 +53,6 @@ struct connman_device {
*/
bool powered;
bool scanning;
- bool disconnected;
char *name;
char *node;
char *address;
@@ -588,7 +587,6 @@ int connman_device_set_powered(struct connman_device
*device,
__connman_technology_enabled(type);
- connman_device_set_disconnected(device, false);
device->scanning = false;
if (device->driver && device->driver->scan)
@@ -623,8 +621,6 @@ int __connman_device_disconnect(struct connman_device
*device)
DBG("device %p", device);
- connman_device_set_disconnected(device, true);
-
g_hash_table_iter_init(&iter, device->networks);
while (g_hash_table_iter_next(&iter, &key, &value)) {
@@ -751,37 +747,6 @@ int connman_device_set_scanning(struct connman_device
*device,
}
/**
- * connman_device_set_disconnected:
- * @device: device structure
- * @disconnected: disconnected state
- *
- * Change disconnected state of device (only for device with networks)
- */
-int connman_device_set_disconnected(struct connman_device *device,
- bool disconnected)
-{
- DBG("device %p disconnected %d", device, disconnected);
-
- if (device->disconnected == disconnected)
- return -EALREADY;
-
- device->disconnected = disconnected;
-
- return 0;
-}
-
-/**
- * connman_device_get_disconnected:
- * @device: device structure
- *
- * Get device disconnected state
- */
-bool connman_device_get_disconnected(struct connman_device *device)
-{
- return device->disconnected;
-}
-
-/**
* connman_device_set_string:
* @device: device structure
* @key: unique identifier
diff --git a/src/network.c b/src/network.c
index ca88318..7945cb4 100644
--- a/src/network.c
+++ b/src/network.c
@@ -136,8 +136,6 @@ static void set_configuration(struct connman_network
*network,
__connman_device_set_network(network->device, network);
- connman_device_set_disconnected(network->device, false);
-
service = connman_service_lookup_from_network(network);
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_CONFIGURATION,
@@ -292,8 +290,6 @@ static int manual_ipv6_set(struct connman_network *network,
__connman_device_set_network(network->device, network);
- connman_device_set_disconnected(network->device, false);
-
connman_network_set_associating(network, false);
network->connecting = false;
@@ -558,8 +554,6 @@ static void autoconf_ipv6_set(struct connman_network
*network)
__connman_device_set_network(network->device, network);
- connman_device_set_disconnected(network->device, false);
-
service = connman_service_lookup_from_network(network);
if (!service)
return;
@@ -811,8 +805,6 @@ static void network_change(struct connman_network *network)
if (!network->connected)
return;
- connman_device_set_disconnected(network->device, true);
-
if (network->driver && network->driver->disconnect) {
network->driver->disconnect(network);
return;
--
2.1.4
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
