diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-02-23 15:46:12 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-02-23 15:46:12 +0000 |
| commit | a2ff5bd22bb9ed6dd387bfe1613ab523985a5f98 (patch) | |
| tree | 9f196f5f015b847c1badff27821e2e923a2baac2 /src/NetworkManagerAP.c | |
| parent | ce911c8a991475ed778292ce5f5ba6636dd02403 (diff) | |
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
Diffstat (limited to 'src/NetworkManagerAP.c')
| -rw-r--r-- | src/NetworkManagerAP.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) |