diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-07-08 11:33:18 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-07-08 11:33:18 +0200 |
| commit | 98ecf19f9d69ef96e253d2c0f9cba12882bf37f6 (patch) | |
| tree | ec8604d7d622a5154484662387528093006bc09d /src/network.c | |
| parent | 3ce93388b0f7a092f5855ac37db8fb30cf0c453e (diff) | |
| download | connman-98ecf19f9d69ef96e253d2c0f9cba12882bf37f6.tar.gz connman-98ecf19f9d69ef96e253d2c0f9cba12882bf37f6.tar.bz2 connman-98ecf19f9d69ef96e253d2c0f9cba12882bf37f6.zip | |
network: Let the gateway code handle the READY transition
For IPv4 (DHCP, fixed or manual), and for manual IPv6, the gateway handling
code (connection.c) is the one responsible for moving to the READY state.
Diffstat (limited to 'src/network.c')
| -rw-r--r-- | src/network.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/network.c b/src/network.c index 6708c2ac..784f67c7 100644 --- a/src/network.c +++ b/src/network.c @@ -832,10 +832,6 @@ static void dhcp_success(struct connman_network *network) if (err < 0) goto err; - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV4); - return; err: @@ -893,10 +889,6 @@ static int set_connected_fixed(struct connman_network *network) if (err < 0) goto err; - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV4); - return 0; err: @@ -932,10 +924,6 @@ static void set_connected_manual(struct connman_network *network) connman_network_set_associating(network, FALSE); - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV4); - return; err: @@ -995,10 +983,6 @@ static int manual_ipv6_set(struct connman_network *network, network->connecting = FALSE; - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV6); - return 0; } @@ -1286,13 +1270,7 @@ static int manual_ipv4_set(struct connman_network *network, return err; } - __connman_ipconfig_gateway_add(ipconfig); - - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV4); - - return 0; + return __connman_ipconfig_gateway_add(ipconfig); } int __connman_network_clear_ipconfig(struct connman_network *network, |