From 2588e28c21b041fe5083c82da834bc0aac925ed4 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 29 Dec 2005 17:09:52 +0000 Subject: [PATCH] 2005-12-29 Dan Williams * include/NetworkManager.h - Add NM_802_11_CAP_PROTO_NONE since we need to recognize between networks that don't have any encryption at all git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1241 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ include/NetworkManager.h | 28 ++++++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3c3ea4c12..73a0f1f923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-29 Dan Williams + + * include/NetworkManager.h + - Add NM_802_11_CAP_PROTO_NONE since we need to recognize + between networks that don't have any encryption at all + 2005-12-29 Dan Williams * test/test-common.c diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 838fe9cb4a..e3037e1f65 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -91,18 +91,22 @@ typedef enum NMDeviceType /* 802.11 wireless-specific device capability bits */ #define NM_802_11_CAP_NONE 0x00000000 -#define NM_802_11_CAP_PROTO_WEP 0x00000001 -#define NM_802_11_CAP_PROTO_WPA 0x00000002 -#define NM_802_11_CAP_PROTO_WPA2 0x00000004 -#define NM_802_11_CAP_RESERVED1 0x00000008 -#define NM_802_11_CAP_KEY_MGMT_PSK 0x00000010 -#define NM_802_11_CAP_KEY_MGMT_802_1X 0x00000020 -#define NM_802_11_CAP_RESERVED2 0x00000040 -#define NM_802_11_CAP_RESERVED3 0x00000080 -#define NM_802_11_CAP_CIPHER_WEP40 0x00000100 -#define NM_802_11_CAP_CIPHER_WEP104 0x00000200 -#define NM_802_11_CAP_CIPHER_TKIP 0x00000400 -#define NM_802_11_CAP_CIPHER_CCMP 0x00000800 +#define NM_802_11_CAP_PROTO_NONE 0x00000001 +#define NM_802_11_CAP_PROTO_WEP 0x00000002 +#define NM_802_11_CAP_PROTO_WPA 0x00000004 +#define NM_802_11_CAP_PROTO_WPA2 0x00000008 +#define NM_802_11_CAP_RESERVED1 0x00000010 +#define NM_802_11_CAP_RESERVED2 0x00000020 +#define NM_802_11_CAP_KEY_MGMT_PSK 0x00000040 +#define NM_802_11_CAP_KEY_MGMT_802_1X 0x00000080 +#define NM_802_11_CAP_RESERVED3 0x00000100 +#define NM_802_11_CAP_RESERVED4 0x00000200 +#define NM_802_11_CAP_RESERVED5 0x00000400 +#define NM_802_11_CAP_RESERVED6 0x00000800 +#define NM_802_11_CAP_CIPHER_WEP40 0x00001000 +#define NM_802_11_CAP_CIPHER_WEP104 0x00002000 +#define NM_802_11_CAP_CIPHER_TKIP 0x00004000 +#define NM_802_11_CAP_CIPHER_CCMP 0x00008000 /*