summaryrefslogtreecommitdiff
path: root/libnm-glib
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2012-07-06 14:47:48 +0200
committerDan Williams <dcbw@redhat.com>2012-10-17 12:08:11 -0500
commitf9c72dee3e9be74925f254c11d7eedc73cad42c7 (patch)
tree4e72de3b30034bc09fb17444fb2d8d4b2df3da6f /libnm-glib
parent802e868f0ff13a539b7613252913cb662914bcf7 (diff)
downloadNetworkManager-f9c72dee3e9be74925f254c11d7eedc73cad42c7.tar.gz
wifi: support ap-mode with wpa_supplicant
A new value for NM80211Mode is introduced (NM_802_11_MODE_AP) and the new mode is passed to wpa_supplicant analogous to adhoc-mode. The places which need to know the interface mode have been extended to handle the new mode. If the configuration does not contain a fixed frequency, a channel is selected the same way as with adhoc-mode before.
Diffstat (limited to 'libnm-glib')
-rw-r--r--libnm-glib/nm-access-point.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index fef65575c7..9326d3abce 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -347,6 +347,9 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
return FALSE;
if (!strcmp (setting_mode, "adhoc") && (ap_mode != NM_802_11_MODE_ADHOC))
return FALSE;
+ /* Hotspot never matches against APs as it's a device-specific mode. */
+ if (!strcmp (setting_mode, "ap"))
+ return FALSE;
}
/* Band and Channel/Frequency */
@@ -658,7 +661,9 @@ nm_access_point_class_init (NMAccessPointClass *ap_class)
/**
* NMAccessPoint:mode:
*
- * The mode of the access point.
+ * The mode of the access point; either "infrastructure" (a central
+ * coordinator of the wireless network allowing clients to connect) or
+ * "ad-hoc" (a network with no central controller).
**/
g_object_class_install_property
(object_class, PROP_MODE,