fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 18:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan: drop nm_modem_get_data_port() function

Browse source 
It was only used by bluetooth's component_added()
check. It should compare rfcomm_iface only against
the control-port, not the data-port.
This commit is contained in:
Thomas Haller 2018-01-11 11:49:48 +01:00
parent 78ca2a70c7
commit de16ef91cf
5 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/bluetooth/nm-device-bt.c
View file

@ -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;
}

1
src/devices/wwan/libnm-wwan.ver
View file

@ -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;

8
src/devices/wwan/nm-modem.c
View file

@ -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)
{

1
src/devices/wwan/nm-modem.h
View file

@ -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);

3
src/devices/wwan/nm-wwan-factory.c
View file

@ -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;
}