fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 02:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm,core: fix device TYPE for Wi-Fi P2P devices

Browse source 
Don't use "wifip2p" for the type description.

    $ nmcli device
    DEVICE             TYPE      STATE         CONNECTION
    wlan0              wifi      connected     x
    p2p-dev-wlan0      wifip2p   disconnected  --

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/87
(cherry picked from commit 8f6a8d0517)
This commit is contained in:
Thomas Haller 2019-02-24 16:44:37 +01:00
parent a6160cb131
commit ab80bf8f87
3 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnm/nm-device-ovs-port.c
View file

@ -75,6 +75,7 @@ get_type_description (NMDevice *device)
{
return "ovs-port";
}
static gboolean
connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
{

7
libnm/nm-device-wifi-p2p.c
View file

@ -342,6 +342,12 @@ get_hw_address (NMDevice *device)
return nm_device_wifi_p2p_get_hw_address (NM_DEVICE_WIFI_P2P (device));
}
static const char *
get_type_description (NMDevice *device)
{
return "wifi-p2p";
}
/*****************************************************************************/
static void
@ -426,6 +432,7 @@ nm_device_wifi_p2p_class_init (NMDeviceWifiP2PClass *wifi_class)
device_class->connection_compatible = connection_compatible;
device_class->get_setting_type = get_setting_type;
device_class->get_hw_address = get_hw_address;
device_class->get_type_description = get_type_description;
nm_object_class->init_dbus = init_dbus;

43
src/devices/wifi/nm-device-wifi-p2p.c
View file

@ -1154,6 +1154,14 @@ nm_device_wifi_p2p_remove (NMDeviceWifiP2P* self)
/*****************************************************************************/
static const char *
get_type_description (NMDevice *device)
{
return "wifi-p2p";
}
/*****************************************************************************/
static const GDBusSignalInfo nm_signal_info_wifi_p2p_peer_added = NM_DEFINE_GDBUS_SIGNAL_INFO_INIT (
"PeerAdded",
.args = NM_DEFINE_GDBUS_ARG_INFOS (
@ -1286,33 +1294,34 @@ nm_device_wifi_p2p_class_init (NMDeviceWifiP2PClass *klass)
NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
object_class->constructed = constructed;
object_class->constructed = constructed;
object_class->get_property = get_property;
object_class->dispose = dispose;
object_class->finalize = finalize;
object_class->dispose = dispose;
object_class->finalize = finalize;
dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_wifi_p2p);
device_class->connection_type_supported = NM_SETTING_WIFI_P2P_SETTING_NAME;
device_class->connection_type_supported = NM_SETTING_WIFI_P2P_SETTING_NAME;
device_class->connection_type_check_compatible = NM_SETTING_WIFI_P2P_SETTING_NAME;
device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_WIFI_P2P);
device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_WIFI_P2P);
device_class->get_type_description = get_type_description;
/* Do we need compatibility checking or is the default good enough? */
device_class->is_available = is_available;
device_class->check_connection_compatible = check_connection_compatible;
device_class->complete_connection = complete_connection;
device_class->is_available = is_available;
device_class->check_connection_compatible = check_connection_compatible;
device_class->complete_connection = complete_connection;
device_class->act_stage1_prepare = act_stage1_prepare;
device_class->act_stage2_config = act_stage2_config;
device_class->get_configured_mtu = get_configured_mtu;
device_class->get_auto_ip_config_method = get_auto_ip_config_method;
device_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
device_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
device_class->act_stage1_prepare = act_stage1_prepare;
device_class->act_stage2_config = act_stage2_config;
device_class->get_configured_mtu = get_configured_mtu;
device_class->get_auto_ip_config_method = get_auto_ip_config_method;
device_class->act_stage3_ip4_config_start = act_stage3_ip4_config_start;
device_class->act_stage3_ip6_config_start = act_stage3_ip6_config_start;
device_class->deactivate = deactivate;
device_class->unmanaged_on_quit = unmanaged_on_quit;
device_class->deactivate = deactivate;
device_class->unmanaged_on_quit = unmanaged_on_quit;
device_class->state_changed = device_state_changed;
device_class->state_changed = device_state_changed;
obj_properties[PROP_PEERS] =
g_param_spec_boxed (NM_DEVICE_WIFI_P2P_PEERS, "", "",