2007-02-23 Dan Williams <dcbw@redhat.com>

Patch from Andy Whitcroft <apw@shadowen.org> (Gnome.org #410426)

	* src/NetworkManagerAP.c
		- (add_capabilities_from_cipher): fix addition of WEP capabilities by
			OR-ing rather than AND-ing



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2358 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-02-23 15:46:12 +00:00
parent ce911c8a99
commit a2ff5bd22b
2 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2007-02-23 Dan Williams <dcbw@redhat.com>
Patch from Andy Whitcroft <apw@shadowen.org> (Gnome.org #410426)
* src/NetworkManagerAP.c
- (add_capabilities_from_cipher): fix addition of WEP capabilities by
OR-ing rather than AND-ing
2007-02-20 Tambet Ingo <tambet@ximian.com>
* libnm-glib/nm-device-802-11-wireless.c: Add "network-added" and

View file

@ -912,12 +912,14 @@ static guint32 add_capabilities_from_cipher (guint32 caps, int cipher)
{
if (cipher & IW_AUTH_CIPHER_WEP40)
{
caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40);
caps |= NM_802_11_CAP_PROTO_WEP;
caps |= NM_802_11_CAP_CIPHER_WEP40;
caps &= ~NM_802_11_CAP_PROTO_NONE;
}
if (cipher & IW_AUTH_CIPHER_WEP104)
{
caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104);
caps |= NM_802_11_CAP_PROTO_WEP;
caps |= NM_802_11_CAP_CIPHER_WEP104;
caps &= ~NM_802_11_CAP_PROTO_NONE;
}
if (cipher & IW_AUTH_CIPHER_TKIP)