colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core,wifi-p2p: Fix Wi-Fi P2P device type

Browse Source 
The device type was set to the GType rather than a new value in the
NMDeviceType enum.

Add the corresponding enum entry, fix the device type and set the
routing priority to the same value as generic devices.

(cherry picked from commit 8d9365a973)
This commit is contained in:
Benjamin Berg
2019-03-07 21:20:28 +01:00
committed by Thomas Haller
parent f9d7712e62
commit 2d547059dc
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-core/nm-dbus-interface.h
View File

@@ -222,6 +222,7 @@ typedef enum {
* @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device * @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device
* @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface * @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface
* @NM_DEVICE_TYPE_WIREGUARD: a WireGuard 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 * #NMDeviceType values indicate the type of hardware represented by a
* device object. * device object.
@@ -257,6 +258,7 @@ typedef enum {
NM_DEVICE_TYPE_WPAN = 27, NM_DEVICE_TYPE_WPAN = 27,
NM_DEVICE_TYPE_6LOWPAN = 28, NM_DEVICE_TYPE_6LOWPAN = 28,
NM_DEVICE_TYPE_WIREGUARD = 29, NM_DEVICE_TYPE_WIREGUARD = 29,
NM_DEVICE_TYPE_WIFI_P2P = 30,
} NMDeviceType; } NMDeviceType;
/** /**

3
libnm/nm-device.c
View File

@@ -294,6 +294,7 @@ coerce_type (NMDeviceType type)
case NM_DEVICE_TYPE_WPAN: case NM_DEVICE_TYPE_WPAN:
case NM_DEVICE_TYPE_6LOWPAN: case NM_DEVICE_TYPE_6LOWPAN:
case NM_DEVICE_TYPE_WIREGUARD: case NM_DEVICE_TYPE_WIREGUARD:
case NM_DEVICE_TYPE_WIFI_P2P:
return type; return type;
} }
return NM_DEVICE_TYPE_UNKNOWN; return NM_DEVICE_TYPE_UNKNOWN;
@@ -1427,6 +1428,8 @@ get_type_name (NMDevice *device)
return _("6LoWPAN"); return _("6LoWPAN");
case NM_DEVICE_TYPE_WIREGUARD: case NM_DEVICE_TYPE_WIREGUARD:
return _("WireGuard"); return _("WireGuard");
case NM_DEVICE_TYPE_WIFI_P2P:
return _("Wi-Fi P2P");
case NM_DEVICE_TYPE_GENERIC: case NM_DEVICE_TYPE_GENERIC:
case NM_DEVICE_TYPE_UNUSED1: case NM_DEVICE_TYPE_UNUSED1:
case NM_DEVICE_TYPE_UNUSED2: case NM_DEVICE_TYPE_UNUSED2:

1
src/devices/nm-device.c
View File

@@ -2114,6 +2114,7 @@ nm_device_get_route_metric_default (NMDeviceType device_type)
return 800; return 800;
case NM_DEVICE_TYPE_WPAN: case NM_DEVICE_TYPE_WPAN:
return 850; return 850;
case NM_DEVICE_TYPE_WIFI_P2P:
case NM_DEVICE_TYPE_GENERIC: case NM_DEVICE_TYPE_GENERIC:
return 950; return 950;
case NM_DEVICE_TYPE_UNKNOWN: case NM_DEVICE_TYPE_UNKNOWN:

2
src/devices/wifi/nm-device-wifi-p2p.c
View File

@@ -1241,7 +1241,7 @@ nm_device_wifi_p2p_new (const char *iface)
return g_object_new (NM_TYPE_DEVICE_WIFI_P2P, return g_object_new (NM_TYPE_DEVICE_WIFI_P2P,
NM_DEVICE_IFACE, iface, NM_DEVICE_IFACE, iface,
NM_DEVICE_TYPE_DESC, "802.11 Wi-Fi P2P", 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_LINK_TYPE, NM_LINK_TYPE_WIFI,
NM_DEVICE_RFKILL_TYPE, RFKILL_TYPE_WLAN, NM_DEVICE_RFKILL_TYPE, RFKILL_TYPE_WLAN,
NULL); NULL);