diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-11 11:49:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-02-21 20:28:46 +0100 |
| commit | de16ef91cfcf11daed29a5dab842d99706a519d9 (patch) | |
| tree | d49fa31f4257c35a3ea94f0a4d7c7623ed8353bf | |
| parent | 78ca2a70c719b255aa7de04cffaa264bb4d06b55 (diff) | |
| download | NetworkManager-de16ef91cfcf11daed29a5dab842d99706a519d9.tar.gz | |
wwan: drop nm_modem_get_data_port() functionth/modem-ip-iface
It was only used by bluetooth's component_added()
check. It should compare rfcomm_iface only against
the control-port, not the data-port.
| -rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 4 | ||||
| -rw-r--r-- | src/devices/wwan/libnm-wwan.ver | 1 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 8 | ||||
| -rw-r--r-- | src/devices/wwan/nm-modem.h | 1 | ||||
| -rw-r--r-- | src/devices/wwan/nm-wwan-factory.c | 3 |
5 files changed, 2 insertions, 15 deletions
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index c039a158b8..77d258ecdd 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -660,9 +660,7 @@ component_added (NMDevice *device, GObject *component) gs_free char *base = NULL; base = g_path_get_basename (priv->rfcomm_iface); - if (!NM_IN_STRSET (base, - nm_modem_get_control_port (modem), - nm_modem_get_data_port (modem))) + if (!nm_streq (base, nm_modem_get_control_port (modem))) return FALSE; } diff --git a/src/devices/wwan/libnm-wwan.ver b/src/devices/wwan/libnm-wwan.ver index d30a175ce7..70b954c5d8 100644 --- a/src/devices/wwan/libnm-wwan.ver +++ b/src/devices/wwan/libnm-wwan.ver @@ -11,7 +11,6 @@ global: nm_modem_get_capabilities; nm_modem_get_configured_mtu; nm_modem_get_control_port; - nm_modem_get_data_port; nm_modem_get_driver; nm_modem_get_iid; nm_modem_get_path; diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 873d871875..85f6eb039e 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1399,14 +1399,6 @@ nm_modem_get_control_port (NMModem *self) return NM_MODEM_GET_PRIVATE (self)->control_port; } -const char * -nm_modem_get_data_port (NMModem *self) -{ - g_return_val_if_fail (NM_IS_MODEM (self), NULL); - - return NM_MODEM_GET_PRIVATE (self)->data_port; -} - int nm_modem_get_ip_ifindex (NMModem *self) { diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index 047cb37af8..a95da25534 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -164,7 +164,6 @@ GType nm_modem_get_type (void); const char *nm_modem_get_path (NMModem *modem); const char *nm_modem_get_uid (NMModem *modem); const char *nm_modem_get_control_port (NMModem *modem); -const char *nm_modem_get_data_port (NMModem *modem); int nm_modem_get_ip_ifindex (NMModem *modem); const char *nm_modem_get_driver (NMModem *modem); const char *nm_modem_get_device_id (NMModem *modem); diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c index 8767fe09c1..f0aae04008 100644 --- a/src/devices/wwan/nm-wwan-factory.c +++ b/src/devices/wwan/nm-wwan-factory.c @@ -94,8 +94,7 @@ modem_added_cb (NMModemManager *manager, */ if (driver && strstr (driver, "bluetooth")) { nm_log_info (LOGD_MB, "ignoring modem '%s' (no associated Bluetooth device)", - nm_modem_get_data_port (modem) - ?: nm_modem_get_control_port (modem)); + nm_modem_get_control_port (modem)); return; } |