platform: merge NM_LINK_TYPE_GENERIC into NM_LINK_TYPE_UNKNOWN
This commit is contained in:
@@ -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;
|
||||
|
@@ -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"))
|
||||
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user