diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-11-04 22:50:54 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-11-04 22:50:54 +0100 |
| commit | c865c773213ed9fa142a159f06c3657e6e157102 (patch) | |
| tree | 91a0f4d3bbaafb7a48c461b946b3b13b1794056a /src | |
| parent | 5f4949b4f2b2319497cdf445985cb1d870394fb9 (diff) | |
| download | connman-c865c773213ed9fa142a159f06c3657e6e157102.tar.gz connman-c865c773213ed9fa142a159f06c3657e6e157102.tar.bz2 connman-c865c773213ed9fa142a159f06c3657e6e157102.zip | |
Remove unneeded enum connman_network_protocol
Diffstat (limited to 'src')
| -rw-r--r-- | src/network.c | 23 | ||||
| -rw-r--r-- | src/service.c | 2 |
2 files changed, 0 insertions, 25 deletions
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; |