diff options
| author | Michael Biebl <biebl@debian.org> | 2011-08-23 19:17:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-08-23 19:17:03 +0200 |
| commit | 72acf6b5cf8cf7df57288a5ebca56cd84d21ff62 (patch) | |
| tree | 45a40c078a86d4043a303ca0f81735daf263f175 /libnm-util/nm-utils.c | |
| parent | 232698d28a1764e179f668f480738b8c7117e70a (diff) | |
| parent | 263bf4c0c89bb88dc995acd9a6a2de9095fbd461 (diff) | |
Merge commit 'upstream/0.9.0' into experimental
Diffstat (limited to 'libnm-util/nm-utils.c')
| -rw-r--r-- | libnm-util/nm-utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 449deb1c..d8bcf349 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1192,12 +1192,12 @@ device_supports_ap_ciphers (guint32 dev_caps, **/ gboolean nm_utils_security_valid (NMUtilsSecurityType type, - guint32 wifi_caps, + NMDeviceWifiCapabilities wifi_caps, gboolean have_ap, gboolean adhoc, - guint32 ap_flags, - guint32 ap_wpa, - guint32 ap_rsn) + NM80211ApFlags ap_flags, + NM80211ApSecurityFlags ap_wpa, + NM80211ApSecurityFlags ap_rsn) { gboolean good = TRUE; |