Merge "[CONNMAN][Change AP's max speed logic]" into tizen

diff --combined src/service.c
index e0947e9,614be70..ea61f32
--- 1/src/service.c
--- 2/src/service.c
+++ b/src/service.c
@@@ -3253,6 -3253,7 +3253,7 @@@ static void append_wifi_ext_info(DBusMe
        unsigned int ssid_len;
        unsigned char *bssid;
        unsigned int maxrate;
+       int maxspeed;
        unsigned int keymgmt;
        uint16_t frequency;
        const char *enc_mode;
@@@ -3265,6 -3266,7 +3266,7 @@@
        ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len);
        bssid = connman_network_get_bssid(network);
        maxrate = connman_network_get_maxrate(network);
+       maxspeed = connman_network_get_maxspeed(network);
        frequency = connman_network_get_frequency(network);
        enc_mode = connman_network_get_enc_mode(network);
        passpoint = connman_network_get_bool(network, "WiFi.HS20AP");
@@@ -3285,6 -3287,8 +3287,8 @@@
                                        DBUS_TYPE_STRING, &bssid_str);
        connman_dbus_dict_append_basic(dict, "MaxRate",
                                        DBUS_TYPE_UINT32, &maxrate);
+       connman_dbus_dict_append_basic(dict, "MaxSpeed",
+                                       DBUS_TYPE_INT32, &maxspeed);
        connman_dbus_dict_append_basic(dict, "Frequency",
                                        DBUS_TYPE_UINT16, &frequency);
        connman_dbus_dict_append_basic(dict, "EncryptionMode",
@@@ -8599,15 -8603,8 +8603,15 @@@ static int service_register(struct conn
  
        DBG("path %s", service->path);
  
 +#if defined TIZEN_EXT
 +      service_load(service);
 +      int ret = __connman_config_provision_service(service);
 +      if (ret < 0)
 +              DBG("Failed to provision service");
 +#else
        if (__connman_config_provision_service(service) < 0)
                service_load(service);
 +#endif
  
        g_dbus_register_interface(connection, service->path,
                                        CONNMAN_SERVICE_INTERFACE,