2007-10-17 Dan Williams <dcbw@redhat.com>

* 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
This commit is contained in:
Dan Williams 2007-10-17 21:29:41 +00:00
parent 7d424355e2
commit 0ec52985d5
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2007-10-17 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com>
* src/nm-manager.h

View file

@ -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;