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

platform/trivial: rename NM_LINK_TYPE_WWAN_ETHERNET to NM_LINK_TYPE_WWAN_NET

Browse Source 
Some newer WWAN netdev types are "rawip" which don't bother with
ethernet framing.
This commit is contained in:
Dan Williams
2016-06-14 11:19:15 -05:00
committed by Thomas Haller
parent 4143fbde17
commit f969193db4
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/wwan/nm-wwan-factory.c
View File

@@ -90,7 +90,7 @@ modem_added_cb (NMModemManager *manager,
NM_DEVICE_FACTORY_DECLARE_TYPES ( NM_DEVICE_FACTORY_DECLARE_TYPES (
NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_WWAN_ETHERNET) NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_WWAN_NET)
NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_GSM_SETTING_NAME, NM_SETTING_CDMA_SETTING_NAME) NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_GSM_SETTING_NAME, NM_SETTING_CDMA_SETTING_NAME)
) )
@@ -102,7 +102,7 @@ create_device (NMDeviceFactory *factory,
gboolean *out_ignore) gboolean *out_ignore)
{ {
g_return_val_if_fail (plink, NULL); g_return_val_if_fail (plink, NULL);
g_return_val_if_fail (plink->type == NM_LINK_TYPE_WWAN_ETHERNET, NULL); g_return_val_if_fail (plink->type == NM_LINK_TYPE_WWAN_NET, NULL);
*out_ignore = TRUE; *out_ignore = TRUE;
return NULL; return NULL;
} }

2
src/nm-manager.c
View File

@@ -2147,7 +2147,7 @@ platform_link_added (NMManager *self,
if (device == NULL) { if (device == NULL) {
switch (plink->type) { switch (plink->type) {
case NM_LINK_TYPE_WWAN_ETHERNET: case NM_LINK_TYPE_WWAN_NET:
case NM_LINK_TYPE_BNEP: case NM_LINK_TYPE_BNEP:
case NM_LINK_TYPE_OLPC_MESH: case NM_LINK_TYPE_OLPC_MESH:
case NM_LINK_TYPE_TEAM: case NM_LINK_TYPE_TEAM:

2
src/nm-types.h
View File

@@ -115,7 +115,7 @@ typedef enum {
NM_LINK_TYPE_INFINIBAND, NM_LINK_TYPE_INFINIBAND,
NM_LINK_TYPE_OLPC_MESH, NM_LINK_TYPE_OLPC_MESH,
NM_LINK_TYPE_WIFI, NM_LINK_TYPE_WIFI,
NM_LINK_TYPE_WWAN_ETHERNET, /* WWAN pseudo-ethernet */ NM_LINK_TYPE_WWAN_NET, /* WWAN kernel netdevice */
NM_LINK_TYPE_WIMAX, NM_LINK_TYPE_WIMAX,
/* Software types */ /* Software types */

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

@@ -360,7 +360,7 @@ static const LinkDesc linktypes[] = {
{ NM_LINK_TYPE_INFINIBAND, "infiniband", NULL, NULL }, { NM_LINK_TYPE_INFINIBAND, "infiniband", NULL, NULL },
{ NM_LINK_TYPE_OLPC_MESH, "olpc-mesh", NULL, NULL }, { NM_LINK_TYPE_OLPC_MESH, "olpc-mesh", NULL, NULL },
{ NM_LINK_TYPE_WIFI, "wifi", NULL, "wlan" }, { NM_LINK_TYPE_WIFI, "wifi", NULL, "wlan" },
{ NM_LINK_TYPE_WWAN_ETHERNET, "wwan", NULL, "wwan" }, { NM_LINK_TYPE_WWAN_NET, "wwan", NULL, "wwan" },
{ NM_LINK_TYPE_WIMAX, "wimax", "wimax", "wimax" }, { NM_LINK_TYPE_WIMAX, "wimax", "wimax", "wimax" },
{ NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL }, { NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL },