diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-20 23:06:45 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-20 23:06:45 +0100 |
| commit | 8d275584fc94f398f0a7c990dcd057533d9a5856 (patch) | |
| tree | 1bf4a928e201222a008e6776799d174ee3223be3 /include | |
| parent | e17c5736fc3722ce51cb33f3edb203960125a4c1 (diff) | |
Imported Upstream version 0.9.8.0 upstream/0.9.8.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/NetworkManager.h | 7 | ||||
| -rw-r--r-- | include/nm-version.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 74b2d87f..d45ad07b 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2004 - 2012 Red Hat, Inc. + * (C) Copyright 2004 - 2013 Red Hat, Inc. */ #ifndef NETWORK_MANAGER_H @@ -111,6 +111,7 @@ typedef enum { * @NM_DEVICE_TYPE_BOND: a bond master interface * @NM_DEVICE_TYPE_VLAN: an 802.1Q VLAN interface * @NM_DEVICE_TYPE_ADSL: ADSL modem + * @NM_DEVICE_TYPE_BRIDGE: a bridge master interface * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. @@ -157,6 +158,7 @@ typedef enum { * @NM_WIFI_DEVICE_CAP_WPA: device supports WPA1 authentication * @NM_WIFI_DEVICE_CAP_RSN: device supports WPA2/RSN authentication * @NM_WIFI_DEVICE_CAP_AP: device supports Access Point mode + * @NM_WIFI_DEVICE_CAP_ADHOC: device supports Ad-Hoc mode * * 802.11 specific device encryption and authentication capabilities. **/ @@ -168,7 +170,8 @@ typedef enum { NM_WIFI_DEVICE_CAP_CIPHER_CCMP = 0x00000008, NM_WIFI_DEVICE_CAP_WPA = 0x00000010, NM_WIFI_DEVICE_CAP_RSN = 0x00000020, - NM_WIFI_DEVICE_CAP_AP = 0x00000040 + NM_WIFI_DEVICE_CAP_AP = 0x00000040, + NM_WIFI_DEVICE_CAP_ADHOC = 0x00000080 } NMDeviceWifiCapabilities; diff --git a/include/nm-version.h b/include/nm-version.h index 0e5bfbcb..d03b0299 100644 --- a/include/nm-version.h +++ b/include/nm-version.h @@ -43,7 +43,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (7) +#define NM_MICRO_VERSION (8) /** * NM_CHECK_VERSION: |