wimax: Remove unused station_type

And remove therefore the dependencie on connman_network_set_string().

diff --git a/plugins/iwmx.c b/plugins/iwmx.c
index 079669a3cdbcbddccb4fe2143acf8b3e77f4c706..419b3c98c9fc46daa2cd7dc422d3c16d6cb08a07 100644 (file)
--- a/plugins/iwmx.c
+++ b/plugins/iwmx.c
@@ -119,7 +119,6 @@ static struct connman_network_driver iwmx_cm_network_driver = {
  */
 struct connman_network *__iwmx_cm_network_available(
                        struct wmxsdk *wmxsdk, const char *station_name,
-                       const char *station_type,
                        const void *sdk_nspname, size_t sdk_nspname_size,
                                                                int strength)
 {
@@ -156,7 +155,6 @@ struct connman_network *__iwmx_cm_network_available(
                DBG("updating network %s nw %p\n", station_name, nw);
        connman_network_set_available(nw, TRUE);
        connman_network_set_strength(nw, strength);
-       connman_network_set_string(nw, "WiMAX Network Type", station_type);
 error_add:
        return nw;
 }
@@ -168,14 +166,13 @@ error_add:
  */
 struct connman_network *iwmx_cm_network_available(
                        struct wmxsdk *wmxsdk, const char *station_name,
-                       const char *station_type,
                        const void *sdk_nspname, size_t sdk_nspname_size,
                                                                int strength)
 {
        struct connman_network *nw;
 
        g_static_mutex_lock(&wmxsdk->network_mutex);
-       nw = __iwmx_cm_network_available(wmxsdk, station_name, station_type,
+       nw = __iwmx_cm_network_available(wmxsdk, station_name,
                                        sdk_nspname, sdk_nspname_size,
                                        strength);
        g_static_mutex_unlock(&wmxsdk->network_mutex);

diff --git a/plugins/iwmx.h b/plugins/iwmx.h
index 9d85ea72126fef35fa9f581eb8ae32ad31a076be..f3bc07b41816a6d949da6ec2adba83f98830eea8 100644 (file)
--- a/plugins/iwmx.h
+++ b/plugins/iwmx.h
@@ -160,13 +160,11 @@ enum {
 
 struct connman_network *__iwmx_cm_network_available(
                        struct wmxsdk *wmxsdk, const char *station_name,
-                       const char *station_type,
                        const void *sdk_nspname, size_t sdk_nspname_size,
                                                                int strength);
 
 struct connman_network *iwmx_cm_network_available(
                        struct wmxsdk *wmxsdk, const char *station_name,
-                       const char *station_type,
                        const void *sdk_nspname, size_t sdk_nspname_size,
                                                                int strength);
 

diff --git a/plugins/iwmxsdk.c b/plugins/iwmxsdk.c
index 8a522ff48b23f29dacb6d66c10b6fcef9d71985a..33ea3c3893b995dacf03cde78eb325e2f2167c5e 100644 (file)
--- a/plugins/iwmxsdk.c
+++ b/plugins/iwmxsdk.c
@@ -211,13 +211,11 @@ struct connman_network *__iwmx_sdk_get_connected_network(struct wmxsdk *wmxsdk)
                strcpy((char *) nsp_info.NSPName, "unknown");
                nw = iwmx_cm_network_available(
                        wmxsdk, "unknown",
-                       iwmx_sdk_network_type_name(WIMAX_API_UNKNOWN),
                        nsp_info.NSPName, strlen((char *) nsp_info.NSPName) + 1,
                        cinr_to_percentage(nsp_info.CINR - 10));
        } else {
                nw = iwmx_cm_network_available(
                        wmxsdk, (char *) nsp_info.NSPName,
-                       iwmx_sdk_network_type_name(nsp_info.networkType),
                        nsp_info.NSPName, strlen((char *) nsp_info.NSPName) + 1,
                        cinr_to_percentage(nsp_info.CINR - 10));
        }
@@ -601,7 +599,6 @@ static void __iwmx_sdk_scan_common_cb(WIMAX_API_DEVICE_ID *device_id,
 
                __iwmx_cm_network_available(
                        wmxsdk, station_name,
-                       iwmx_sdk_network_type_name(nsp_info->networkType),
                        nsp_info->NSPName,
                        strlen((char *) nsp_info->NSPName) + 1,
                        strength);