summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/connman.h1
-rw-r--r--src/device.c4
-rw-r--r--src/element.c1
-rw-r--r--src/inet.c14
-rw-r--r--src/network.c5
-rw-r--r--src/service.c2
-rw-r--r--src/udev-compat.c6
-rw-r--r--src/udev.c57
8 files changed, 0 insertions, 90 deletions
diff --git a/src/connman.h b/src/connman.h
index fd5afd5b..f754a6b0 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -266,7 +266,6 @@ int __connman_udev_init(void);
void __connman_udev_start(void);
void __connman_udev_cleanup(void);
char *__connman_udev_get_devtype(const char *ifname);
-char *__connman_udev_get_mbm_devnode(const char *ifname);
void __connman_udev_rfkill(const char *sysname, connman_bool_t blocked);
void __connman_udev_enable_rfkill_processing(void);
connman_bool_t __connman_udev_get_blocked(int phyindex);
diff --git a/src/device.c b/src/device.c
index 0ba39c6a..f9dbe865 100644
--- a/src/device.c
+++ b/src/device.c
@@ -134,7 +134,6 @@ static const char *type2description(enum connman_device_type type)
case CONNMAN_DEVICE_TYPE_GPS:
return "GPS";
case CONNMAN_DEVICE_TYPE_CELLULAR:
- case CONNMAN_DEVICE_TYPE_MBM:
return "Cellular";
}
@@ -158,7 +157,6 @@ static const char *type2string(enum connman_device_type type)
case CONNMAN_DEVICE_TYPE_GPS:
return "gps";
case CONNMAN_DEVICE_TYPE_CELLULAR:
- case CONNMAN_DEVICE_TYPE_MBM:
return "cellular";
}
@@ -183,7 +181,6 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
case CONNMAN_DEVICE_TYPE_CELLULAR:
- case CONNMAN_DEVICE_TYPE_MBM:
return CONNMAN_SERVICE_TYPE_CELLULAR;
}
@@ -757,7 +754,6 @@ struct connman_device *connman_device_create(const char *node,
device->scan_interval = 0;
break;
case CONNMAN_DEVICE_TYPE_CELLULAR:
- case CONNMAN_DEVICE_TYPE_MBM:
device->scan_interval = 0;
break;
}
diff --git a/src/element.c b/src/element.c
index cf90b67b..faaa9f84 100644
--- a/src/element.c
+++ b/src/element.c
@@ -211,7 +211,6 @@ struct connman_service *__connman_element_get_service(struct connman_element *el
case CONNMAN_DEVICE_TYPE_WIMAX:
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
case CONNMAN_DEVICE_TYPE_CELLULAR:
- case CONNMAN_DEVICE_TYPE_MBM:
network = __connman_element_get_network(element);
if (network == NULL)
return NULL;
diff --git a/src/inet.c b/src/inet.c
index 9fdd916c..ec0850a4 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -375,7 +375,6 @@ enum connman_device_type __connman_inet_get_device_type(int index)
char wimax_path[PATH_MAX];
struct stat st;
struct iwreq iwr;
- char *devnode;
snprintf(phy80211_path, PATH_MAX,
"/sys/class/net/%s/phy80211", devname);
@@ -389,13 +388,6 @@ enum connman_device_type __connman_inet_get_device_type(int index)
memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_ifrn.ifrn_name, devname, IFNAMSIZ);
- devnode = __connman_udev_get_mbm_devnode(devname);
- if (devnode != NULL) {
- devtype = CONNMAN_DEVICE_TYPE_MBM;
- g_free(devnode);
- goto done;
- }
-
if (g_str_has_prefix(devname, "vmnet") == TRUE)
devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
else if (g_str_has_prefix(ifr.ifr_name, "vboxnet") == TRUE)
@@ -465,11 +457,6 @@ struct connman_device *connman_inet_create_device(int index)
case CONNMAN_DEVICE_TYPE_VENDOR:
name = strdup(devname);
break;
- case CONNMAN_DEVICE_TYPE_MBM:
- name = index2ident(index, "");
- addr = index2addr(index);
- node = __connman_udev_get_mbm_devnode(devname);
- break;
}
device = connman_device_create(name, type);
@@ -495,7 +482,6 @@ struct connman_device *connman_inet_create_device(int index)
mode = CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE;
break;
case CONNMAN_DEVICE_TYPE_CELLULAR:
- case CONNMAN_DEVICE_TYPE_MBM:
mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
ident = index2ident(index, NULL);
break;
diff --git a/src/network.c b/src/network.c
index 0849ed07..3fca7bb9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -91,7 +91,6 @@ static const char *type2string(enum connman_network_type type)
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
return "bluetooth";
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
return "cellular";
}
@@ -514,7 +513,6 @@ void connman_network_set_group(struct connman_network *network,
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_WIFI:
case CONNMAN_NETWORK_TYPE_WIMAX:
break;
@@ -566,7 +564,6 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network)
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_WIMAX:
break;
case CONNMAN_NETWORK_TYPE_WIFI:
@@ -1436,7 +1433,6 @@ static int network_probe(struct connman_element *element)
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_WIFI:
case CONNMAN_NETWORK_TYPE_WIMAX:
if (network->group != NULL)
@@ -1467,7 +1463,6 @@ static void network_remove(struct connman_element *element)
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_WIFI:
case CONNMAN_NETWORK_TYPE_WIMAX:
if (network->group != NULL) {
diff --git a/src/service.c b/src/service.c
index 1ee099d9..c28afdbe 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1670,7 +1670,6 @@ static connman_bool_t prepare_network(struct connman_service *service)
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
break;
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
connman_network_set_string(service->network,
"Cellular.APN", service->apn);
@@ -2256,7 +2255,6 @@ static enum connman_service_type convert_network_type(struct connman_network *ne
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
case CONNMAN_NETWORK_TYPE_CELLULAR:
- case CONNMAN_NETWORK_TYPE_MBM:
return CONNMAN_SERVICE_TYPE_CELLULAR;
}
diff --git a/src/udev-compat.c b/src/udev-compat.c
index 9cb3e6f8..5daf4824 100644
--- a/src/udev-compat.c
+++ b/src/udev-compat.c
@@ -63,7 +63,6 @@ static void detect_newlink(unsigned short type, int index,
return;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_WIFI:
- case CONNMAN_DEVICE_TYPE_MBM:
break;
}
@@ -116,11 +115,6 @@ char *__connman_udev_get_devtype(const char *ifname)
return NULL;
}
-char *__connman_udev_get_mbm_devnode(const char *ifname)
-{
- return NULL;
-}
-
void __connman_udev_rfkill(const char *sysname, connman_bool_t blocked)
{
DBG("sysname %s blocked %d", sysname, blocked);
diff --git a/src/udev.c b/src/udev.c
index 983ace64..fe814b83 100644
--- a/src/udev.c
+++ b/src/udev.c
@@ -96,7 +96,6 @@ static void add_net_device(struct udev_device *udev_device)
return;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_WIFI:
- case CONNMAN_DEVICE_TYPE_MBM:
break;
}
@@ -445,62 +444,6 @@ done:
return NULL;
}
-char *__connman_udev_get_mbm_devnode(const char *ifname)
-{
- struct udev_device *device, *parent, *control;
- const char *driver, *devpath1, *devpath2;
- char *devnode = NULL;
- unsigned int i;
-
- device = udev_device_new_from_subsystem_sysname(udev_ctx,
- "net", ifname);
- if (device == NULL)
- return NULL;
-
- parent = udev_device_get_parent(device);
- if (parent == NULL)
- goto done;
-
- driver = udev_device_get_driver(parent);
- if (g_strcmp0(driver, "cdc_ether") != 0)
- goto done;
-
- parent = udev_device_get_parent_with_subsystem_devtype(device,
- "usb", "usb_device");
- if (parent == NULL)
- goto done;
-
- devpath1 = udev_device_get_devpath(parent);
-
- for (i = 0; i < 64; i++) {
- char sysname[16];
-
- snprintf(sysname, sizeof(sysname) - 1, "ttyACM%d", i);
-
- control = udev_device_new_from_subsystem_sysname(udev_ctx,
- "tty", sysname);
- if (control == NULL)
- continue;
-
- parent = udev_device_get_parent_with_subsystem_devtype(control,
- "usb", "usb_device");
- if (parent == NULL)
- continue;
-
- devpath2 = udev_device_get_devpath(parent);
-
- if (g_strcmp0(devpath1, devpath2) == 0) {
- devnode = g_strdup(udev_device_get_devnode(control));
- break;
- }
- }
-
-done:
- udev_device_unref(device);
-
- return devnode;
-}
-
void __connman_udev_rfkill(const char *sysname, connman_bool_t blocked)
{
struct udev_device *device, *parent;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 13:29:17 +0000