Ipconfig enabling in the IPv4 and IPv6 state changing code can be omitted
as the IP configuration is alrady enabled in the network part.
---
src/network.c | 3 ++-
src/service.c | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/network.c b/src/network.c
index badb770..390f824 100644
--- a/src/network.c
+++ b/src/network.c
@@ -218,8 +218,8 @@ static int set_connected_manual(struct connman_network
*network)
network->connecting = false;
service = connman_service_lookup_from_network(network);
-
ipconfig = __connman_service_get_ip4config(service);
+ __connman_ipconfig_enable(ipconfig);
if (!__connman_ipconfig_get_local(ipconfig))
__connman_service_read_ip4config(service);
@@ -246,6 +246,7 @@ static int set_connected_dhcp(struct connman_network
*network)
service = connman_service_lookup_from_network(network);
ipconfig_ipv4 = __connman_service_get_ip4config(service);
+ __connman_ipconfig_enable(ipconfig_ipv4);
err = __connman_dhcp_start(ipconfig_ipv4, network,
dhcp_callback, NULL);
diff --git a/src/service.c b/src/service.c
index 8d73f22..153fafb 100644
--- a/src/service.c
+++ b/src/service.c
@@ -5756,7 +5756,6 @@ int __connman_service_ipconfig_indicate_state(struct
connman_service *service,
case CONNMAN_SERVICE_STATE_ASSOCIATION:
break;
case CONNMAN_SERVICE_STATE_CONFIGURATION:
- __connman_ipconfig_enable(ipconfig);
break;
case CONNMAN_SERVICE_STATE_READY:
if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
@@ -5956,11 +5955,6 @@ static int service_connect(struct connman_service
*service)
&service->stats_roaming.data);
}
- if (service->ipconfig_ipv4)
- __connman_ipconfig_enable(service->ipconfig_ipv4);
- if (service->ipconfig_ipv6)
- __connman_ipconfig_enable(service->ipconfig_ipv6);
-
err = __connman_network_connect(service->network);
} else if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
service->provider)
--
2.1.4
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
