2005-12-14 Dan Williams <dcbw@redhat.com>

* include/NetworkManager.h
		- Update and split 802.11 wireless-specific capabilities from
			generic device capabilities

	* src/NetworkManagerDevice.c
	  src/NetworkManagerDevicePrivate.h
		- (nm_device_wireless_discover_capabilities): Move 802.11
			wireless-specific capability checks to
			NetworkManagerWireless.c
		- Rename NMDeviceWirelessOptions -> NMDevice80211WirelessOptions
		- Rename NMDeviceWiredOptions -> NMDevice80211EthernetOptions

	* src/NetworkManagerWireless.[ch]
		- (nm_802_11_wireless_discover_capabilities): Check extended
			802.11 wireless-specific capabilities of the driver


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1188 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-12-14 17:56:35 +00:00
parent 9841fc9c45
commit a00992c902
6 changed files with 118 additions and 50 deletions

View File

@@ -94,15 +94,33 @@ typedef enum NMEncKeyType
/*
* Device capability bits
* General device capability bits
*
*/
#define NM_DEVICE_CAP_NONE 0x0000
#define NM_DEVICE_CAP_NM_SUPPORTED 0x0001
#define NM_DEVICE_CAP_CARRIER_DETECT 0x0002
#define NM_DEVICE_CAP_WIRELESS_SCAN 0x0004
#define NM_DEVICE_CAP_WIRELESS_WPA 0x0008
#define NM_DEVICE_CAP_WIRELESS_WPA2 0x0010
#define NM_DEVICE_CAP_NONE 0x00000000
#define NM_DEVICE_CAP_NM_SUPPORTED 0x00000001
#define NM_DEVICE_CAP_CARRIER_DETECT 0x00000002
#define NM_DEVICE_CAP_WIRELESS_SCAN 0x00000004
/* 802.11 wireless-specific device capability bits */
#define NM_802_11_CAP_NONE 0x00000000
#define NM_802_11_CAP_KEY_MGMT_WPA 0x00000001
#define NM_802_11_CAP_KEY_MGMT_WPA_PSK 0x00000002
#define NM_802_11_CAP_KEY_MGMT_WPA2 0x00000004
#define NM_802_11_CAP_KEY_MGMT_WPA2_PSK 0x00000008
#define NM_802_11_CAP_KEY_MGMT_RESERVED1 0x00000010
#define NM_802_11_CAP_KEY_MGMT_RESERVED2 0x00000020
#define NM_802_11_CAP_KEY_MGMT_RESERVED3 0x00000040
#define NM_802_11_CAP_KEY_MGMT_RESERVED4 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_CIPHER_RESERVED1 0x00001000
#define NM_802_11_CAP_CIPHER_RESERVED2 0x00002000
#define NM_802_11_CAP_CIPHER_RESERVED3 0x00004000
#define NM_802_11_CAP_CIPHER_RESERVED4 0x00008000
/*