From 2c032d8f1c6292c1338a615e6ec40252889ba85c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Jan 2015 00:29:39 +0100 Subject: Imported Upstream version 1.0.0 --- docs/libnm-util/html/NMSettingWireless.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'docs/libnm-util/html/NMSettingWireless.html') diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html index 803beb00..4d97a075 100644 --- a/docs/libnm-util/html/NMSettingWireless.html +++ b/docs/libnm-util/html/NMSettingWireless.html @@ -107,10 +107,10 @@ const char * gboolean nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, NMSettingWirelessSecurity *s_wireless_sec, - NM80211ApFlags ap_flags, - NM80211ApSecurityFlags ap_wpa, - NM80211ApSecurityFlags ap_rsn, - NM80211Mode ap_mode); + NM80211ApFlags ap_flags, + NM80211ApSecurityFlags ap_wpa, + NM80211ApSecurityFlags ap_rsn, + NM80211Mode ap_mode); const char * nm_setting_wireless_get_security (NMSettingWireless *setting); @@ -950,10 +950,10 @@ not be preserved. 
gboolean            nm_setting_wireless_ap_security_compatible
                                                         (NMSettingWireless *s_wireless,
                                                          NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
+ NM80211ApFlags ap_flags, + NM80211ApSecurityFlags ap_wpa, + NM80211ApSecurityFlags ap_rsn, + NM80211Mode ap_mode);

Given a NMSettingWireless and an optional NMSettingWirelessSecurity, determine if the configuration given by the settings is compatible with @@ -980,16 +980,16 @@ compatible with which access points.

ap_flags :

-the NM80211ApFlags of the given access point +the NM80211ApFlags of the given access point

ap_wpa :

-the NM80211ApSecurityFlags of the given access point's WPA +the NM80211ApSecurityFlags of the given access point's WPA capabilities

ap_rsn :

-the NM80211ApSecurityFlags of the given access point's WPA2/RSN +the NM80211ApSecurityFlags of the given access point's WPA2/RSN capabilities -- cgit 1.3.0-6-gf8a5