diff options
| -rw-r--r-- | include/network.h | 7 | ||||
| -rw-r--r-- | plugins/bluetooth.c | 2 | ||||
| -rw-r--r-- | plugins/ethernet.c | 1 | ||||
| -rw-r--r-- | plugins/ofono.c | 5 | ||||
| -rw-r--r-- | plugins/supplicant.c | 3 | ||||
| -rw-r--r-- | plugins/wifi.c | 3 | ||||
| -rw-r--r-- | src/network.c | 23 | ||||
| -rw-r--r-- | src/service.c | 2 |
8 files changed, 1 insertions, 45 deletions
diff --git a/include/network.h b/include/network.h index d71381b8..dbf6c428 100644 --- a/include/network.h +++ b/include/network.h @@ -47,11 +47,6 @@ enum connman_network_type { CONNMAN_NETWORK_TYPE_VENDOR = 10000, }; -enum connman_network_protocol { - CONNMAN_NETWORK_PROTOCOL_UNKNOWN = 0, - CONNMAN_NETWORK_PROTOCOL_IP = 1, -}; - enum connman_network_error { CONNMAN_NETWORK_ERROR_UNKNOWN = 0, CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL = 1, @@ -79,8 +74,6 @@ struct connman_element *connman_network_get_element( void connman_network_set_index(struct connman_network *network, int index); int connman_network_get_index(struct connman_network *network); -void connman_network_set_protocol(struct connman_network *network, - enum connman_network_protocol protocol); void connman_network_set_group(struct connman_network *network, const char *group); const char *connman_network_get_group(struct connman_network *network); diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index 37f0a6ca..bf89b98c 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -427,8 +427,6 @@ static void network_properties_reply(DBusPendingCall *call, void *user_data) connman_network_set_string(network, "Path", path); - connman_network_set_protocol(network, CONNMAN_NETWORK_PROTOCOL_IP); - connman_network_set_name(network, name); connman_device_add_network(device, network); diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 9a7b0578..797fc7c4 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -95,7 +95,6 @@ static void add_network(struct connman_device *device) connman_network_set_index(network, index); connman_network_set_name(network, "Wired"); - connman_network_set_protocol(network, CONNMAN_NETWORK_PROTOCOL_IP); if (connman_device_add_network(device, network) < 0) { connman_network_unref(network); diff --git a/plugins/ofono.c b/plugins/ofono.c index a58f2ce6..691037db 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -574,10 +574,7 @@ static int add_network(struct connman_device *device, const char *type; dbus_message_iter_get_basic(&value, &type); - if (g_strcmp0(type, "internet") == 0) { - connman_network_set_protocol(network, - CONNMAN_NETWORK_PROTOCOL_IP); - } else { + if (g_strcmp0(type, "internet") != 0) { DBG("path %p type %s", path, type); goto error; } diff --git a/plugins/supplicant.c b/plugins/supplicant.c index f0d1a4ff..5f2d2045 100644 --- a/plugins/supplicant.c +++ b/plugins/supplicant.c @@ -1929,9 +1929,6 @@ static void properties_reply(DBusPendingCall *call, void *user_data) index = connman_device_get_index(task->device); connman_network_set_index(network, index); - connman_network_set_protocol(network, - CONNMAN_NETWORK_PROTOCOL_IP); - connman_network_set_address(network, result.addr, result.addr_len); diff --git a/plugins/wifi.c b/plugins/wifi.c index 69548fdf..e3247a14 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -439,9 +439,6 @@ static void network_added(GSupplicantNetwork *supplicant_network) connman_network_set_index(network, wifi->index); - connman_network_set_protocol(network, - CONNMAN_NETWORK_PROTOCOL_IP); - if (connman_device_add_network(wifi->device, network) < 0) { connman_network_unref(network); return; diff --git a/src/network.c b/src/network.c index 079453c0..c831c141 100644 --- a/src/network.c +++ b/src/network.c @@ -35,7 +35,6 @@ static unsigned int hidden_counter = 0; struct connman_network { struct connman_element element; enum connman_network_type type; - enum connman_network_protocol protocol; connman_bool_t available; connman_bool_t connected; connman_bool_t roaming; @@ -502,19 +501,6 @@ struct connman_element *connman_network_get_element( } /** - * connman_network_set_protocol: - * @network: network structure - * @protocol: network protocol - * - * Change protocol of network - */ -void connman_network_set_protocol(struct connman_network *network, - enum connman_network_protocol protocol) -{ - network->protocol = protocol; -} - -/** * connman_network_set_group: * @network: network structure * @group: group name @@ -831,9 +817,6 @@ static int set_connected_dhcp(struct connman_network *network) DBG("network %p", network); - if (network->protocol != CONNMAN_NETWORK_PROTOCOL_IP) - return -EINVAL; - element = connman_element_create(NULL); if (element == NULL) return -ENOMEM; @@ -1111,9 +1094,6 @@ static int dhcp_start(struct connman_network *network) struct connman_element *element; int error; - if (network->protocol != CONNMAN_NETWORK_PROTOCOL_IP) - return -EINVAL; - element = connman_element_create(NULL); if (element == NULL) return -ENOMEM; @@ -1132,9 +1112,6 @@ static int dhcp_start(struct connman_network *network) static int dhcp_stop(struct connman_network *network) { - if (network->protocol != CONNMAN_NETWORK_PROTOCOL_IP) - return -EINVAL; - connman_element_unregister_children_type(&network->element, CONNMAN_ELEMENT_TYPE_CONNECTION); connman_element_unregister_children_type(&network->element, diff --git a/src/service.c b/src/service.c index ec51a8b8..d8d48994 100644 --- a/src/service.c +++ b/src/service.c @@ -3388,8 +3388,6 @@ static struct connman_network *create_hidden_wifi(struct connman_device *device, index = connman_device_get_index(device); connman_network_set_index(network, index); - connman_network_set_protocol(network, CONNMAN_NETWORK_PROTOCOL_IP); - if (connman_device_add_network(device, network) < 0) { connman_network_unref(network); return NULL; |