From a2ff5bd22bb9ed6dd387bfe1613ab523985a5f98 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 23 Feb 2007 15:46:12 +0000 Subject: [PATCH] 2007-02-23 Dan Williams Patch from Andy Whitcroft (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 --- ChangeLog | 8 ++++++++ src/NetworkManagerAP.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8e7f9e00f..fdf12deb82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-02-23 Dan Williams + + Patch from Andy Whitcroft (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 * libnm-glib/nm-device-802-11-wireless.c: Add "network-added" and diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c index c784dc38cf..9cb605b650 100644 --- a/src/NetworkManagerAP.c +++ b/src/NetworkManagerAP.c @@ -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)