From 0ec52985d5d628e268cbe60f1d170453960c7c49 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 17 Oct 2007 21:29:41 +0000 Subject: [PATCH] 2007-10-17 Dan Williams * src/nm-device-802-11-wireless.c - (get_wireless_capabilities): add missing braces so that WPA capabilities don't get erroneously cleared git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2986 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dc4ca91250..31e11fe8c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-17 Dan Williams + + * src/nm-device-802-11-wireless.c + - (get_wireless_capabilities): add missing braces so that WPA capabilities + don't get erroneously cleared + 2007-10-17 Dan Williams * src/nm-manager.h diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index c4f3605758..9eafdf5fa2 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -323,10 +323,11 @@ get_wireless_capabilities (NMDevice80211Wireless *self, /* Check for WPA support but not cipher support */ if ( (caps & (NM_802_11_DEVICE_CAP_WPA | NM_802_11_DEVICE_CAP_RSN)) - && !(caps & (NM_802_11_DEVICE_CAP_CIPHER_TKIP | NM_802_11_DEVICE_CAP_CIPHER_CCMP))) + && !(caps & (NM_802_11_DEVICE_CAP_CIPHER_TKIP | NM_802_11_DEVICE_CAP_CIPHER_CCMP))) { nm_warning ("%s: device supports WPA protocol but not WPA ciphers; " "WPA unavailable.", iface); caps &= ~WPA_CAPS; + } } return caps;