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

platform: merge NM_LINK_TYPE_GENERIC into NM_LINK_TYPE_UNKNOWN

Browse source
This commit is contained in:
Pavel Šimerda 2013-05-27 18:10:20 +02:00
parent 38a9ac5cc2
commit ae8f2fdf8a
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/platform/nm-fake-platform.c
View file

@ -83,8 +83,6 @@ type_to_type_name (NMLinkType type)
switch (type) {
case NM_LINK_TYPE_UNKNOWN:
return "unknown";
case NM_LINK_TYPE_GENERIC:
return "generic";
case NM_LINK_TYPE_LOOPBACK:
return "loopback";
case NM_LINK_TYPE_ETHERNET:
@ -266,7 +264,6 @@ link_set_up (NMPlatform *platform, int ifindex)
device->link.up = TRUE;
switch (device->link.type) {
case NM_LINK_TYPE_GENERIC:
case NM_LINK_TYPE_DUMMY:
case NM_LINK_TYPE_VLAN:
device->link.connected = TRUE;

2
src/platform/nm-linux-platform.c
View file

@ -319,7 +319,7 @@ link_extract_type (struct rtnl_link *rtnllink, const char **out_name)
break;
}
return_type (NM_LINK_TYPE_GENERIC, "generic");
return_type (NM_LINK_TYPE_UNKNOWN, "unknown");
} else if (!strcmp (type, "ipoib"))
return_type (NM_LINK_TYPE_INFINIBAND, "infiniband");
else if (!strcmp (type, "dummy"))

1
src/platform/nm-platform.h
View file

@ -50,7 +50,6 @@ typedef enum {
typedef enum {
NM_LINK_TYPE_NONE,
NM_LINK_TYPE_UNKNOWN,
NM_LINK_TYPE_GENERIC,
/* Hardware types */
NM_LINK_TYPE_ETHERNET,