diff options
Diffstat (limited to 'src/devices/wifi/nm-wifi-factory.c')
| -rw-r--r-- | src/devices/wifi/nm-wifi-factory.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c index 6b8e5fb8..a1752634 100644 --- a/src/devices/wifi/nm-wifi-factory.c +++ b/src/devices/wifi/nm-wifi-factory.c @@ -27,10 +27,8 @@ #include "nm-setting-olpc-mesh.h" #include "nm-device-wifi.h" #include "nm-device-olpc-mesh.h" -#include "nm-device-iwd.h" #include "settings/nm-settings-connection.h" #include "platform/nm-platform.h" -#include "nm-config.h" /*****************************************************************************/ @@ -77,7 +75,6 @@ create_device (NMDeviceFactory *factory, { NMDeviceWifiCapabilities capabilities; NM80211Mode mode; - gs_free char *backend = NULL; g_return_val_if_fail (iface != NULL, NULL); g_return_val_if_fail (plink != NULL, NULL); @@ -101,30 +98,10 @@ create_device (NMDeviceFactory *factory, return NULL; } - if (plink->type != NM_LINK_TYPE_WIFI) - return nm_device_olpc_mesh_new (iface); - - backend = nm_config_data_get_device_config_by_pllink (NM_CONFIG_GET_DATA, - NM_CONFIG_KEYFILE_KEY_DEVICE_WIFI_BACKEND, - plink, - "wifi", - NULL); - nm_strstrip (backend); - - nm_log_dbg (LOGD_PLATFORM | LOGD_WIFI, - "(%s) config: backend is %s%s%s%s", - iface, - NM_PRINT_FMT_QUOTE_STRING (backend), - WITH_IWD ? " (iwd support enabled)" : ""); - if (!backend || !strcasecmp (backend, "wpa_supplicant")) + if (plink->type == NM_LINK_TYPE_WIFI) return nm_device_wifi_new (iface, capabilities); -#if WITH_IWD - else if (!strcasecmp (backend, "iwd")) - return nm_device_iwd_new (iface, capabilities); -#endif - - nm_log_warn (LOGD_PLATFORM | LOGD_WIFI, "(%s) config: unknown or unsupported wifi-backend %s", iface, backend); - return NULL; + else + return nm_device_olpc_mesh_new (iface); } /*****************************************************************************/ |