Commit e46e5879 authored by Thomas Haller's avatar Thomas Haller

libnm,core: merge branch 'benzea/fix-wifi-p2p-device-type'

NetworkManager/NetworkManager#134

NetworkManager/NetworkManager!95
parents bb25a1c8 a6a185ba
Pipeline #22896 canceled with stages
......@@ -222,6 +222,7 @@ typedef enum {
* @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device
* @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface
* @NM_DEVICE_TYPE_WIREGUARD: a WireGuard interface
* @NM_DEVICE_TYPE_WIFI_P2P: an 802.11 Wi-Fi P2P device (Since: 1.16)
*
* #NMDeviceType values indicate the type of hardware represented by a
* device object.
......@@ -257,6 +258,7 @@ typedef enum {
NM_DEVICE_TYPE_WPAN = 27,
NM_DEVICE_TYPE_6LOWPAN = 28,
NM_DEVICE_TYPE_WIREGUARD = 29,
NM_DEVICE_TYPE_WIFI_P2P = 30,
} NMDeviceType;
/**
......
......@@ -294,6 +294,7 @@ coerce_type (NMDeviceType type)
case NM_DEVICE_TYPE_WPAN:
case NM_DEVICE_TYPE_6LOWPAN:
case NM_DEVICE_TYPE_WIREGUARD:
case NM_DEVICE_TYPE_WIFI_P2P:
return type;
}
return NM_DEVICE_TYPE_UNKNOWN;
......@@ -355,7 +356,7 @@ get_property (GObject *object,
switch (prop_id) {
case PROP_DEVICE_TYPE:
g_value_set_enum (value, coerce_type (nm_device_get_device_type (device)));
g_value_set_enum (value, nm_device_get_device_type (device));
break;
case PROP_UDI:
g_value_set_string (value, nm_device_get_udi (device));
......@@ -936,7 +937,7 @@ nm_device_get_device_type (NMDevice *self)
{
g_return_val_if_fail (NM_IS_DEVICE (self), NM_DEVICE_TYPE_UNKNOWN);
return NM_DEVICE_GET_PRIVATE (self)->device_type;
return coerce_type (NM_DEVICE_GET_PRIVATE (self)->device_type);
}
/**
......@@ -1427,6 +1428,8 @@ get_type_name (NMDevice *device)
return _("6LoWPAN");
case NM_DEVICE_TYPE_WIREGUARD:
return _("WireGuard");
case NM_DEVICE_TYPE_WIFI_P2P:
return _("Wi-Fi P2P");
case NM_DEVICE_TYPE_GENERIC:
case NM_DEVICE_TYPE_UNUSED1:
case NM_DEVICE_TYPE_UNUSED2:
......
......@@ -2114,6 +2114,7 @@ nm_device_get_route_metric_default (NMDeviceType device_type)
return 800;
case NM_DEVICE_TYPE_WPAN:
return 850;
case NM_DEVICE_TYPE_WIFI_P2P:
case NM_DEVICE_TYPE_GENERIC:
return 950;
case NM_DEVICE_TYPE_UNKNOWN:
......
......@@ -1241,7 +1241,7 @@ nm_device_wifi_p2p_new (const char *iface)
return g_object_new (NM_TYPE_DEVICE_WIFI_P2P,
NM_DEVICE_IFACE, iface,
NM_DEVICE_TYPE_DESC, "802.11 Wi-Fi P2P",
NM_DEVICE_DEVICE_TYPE, NM_TYPE_DEVICE_WIFI_P2P,
NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_WIFI_P2P,
NM_DEVICE_LINK_TYPE, NM_LINK_TYPE_WIFI,
NM_DEVICE_RFKILL_TYPE, RFKILL_TYPE_WLAN,
NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment