platform: don't treat unrecognized WiMAX devices as Ethernet

If the WiMAX plugin isn't installed, or the WiMAX device isn't
recognized, NetworkManager shouldn't treat the interface as
regular ethernet since the device requires specific setup to
be ready for IP configuration, which of course NetworkManager
can't do because the WiMAX plugin isn't loaded.  Ignore them
instead.
This commit is contained in:
Dan Williams 2013-10-18 11:12:40 -05:00
parent 33f8218023
commit 6b8bf26b79
3 changed files with 9 additions and 0 deletions

View file

@ -2506,6 +2506,12 @@ platform_link_added_cb (NMPlatform *platform,
*/
break;
case NM_LINK_TYPE_WIMAX:
/* If the WiMAX plugin is not installed, we can't control the
* interface, so ignore it.
*/
break;
default:
device = nm_device_generic_new (link);
break;

View file

@ -495,6 +495,8 @@ link_type_from_udev (NMPlatform *platform, int ifindex, int arptype, const char
return_type (NM_LINK_TYPE_WIFI, "wifi");
else if (g_strcmp0 (prop, "wwan") == 0)
return_type (NM_LINK_TYPE_WWAN_ETHERNET, "wwan");
else if (g_strcmp0 (prop, "wimax") == 0)
return_type (NM_LINK_TYPE_WIMAX, "wimax");
if (arptype == ARPHRD_ETHER)
return_type (NM_LINK_TYPE_ETHERNET, "ethernet");

View file

@ -79,6 +79,7 @@ typedef enum {
NM_LINK_TYPE_OLPC_MESH,
NM_LINK_TYPE_WIFI,
NM_LINK_TYPE_WWAN_ETHERNET, /* WWAN pseudo-ethernet */
NM_LINK_TYPE_WIMAX,
/* Software types */
NM_LINK_TYPE_DUMMY = 0x10000,