diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /introspection/nm-device.xml | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'introspection/nm-device.xml')
| -rw-r--r-- | introspection/nm-device.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 7f6a0a07..20bbb917 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -274,6 +274,11 @@ The device is a VLAN interface. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="ADSL" value="12"> + <tp:docstring> + The device is an ADSL device supporting PPPoE and PPPoATM protocols. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u"> @@ -544,7 +549,7 @@ A dependency of the connection failed. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="BR2684_FAILED" value="50"> + <tp:enumvalue suffix="BR2684_FAILED" value="51"> <tp:docstring> Problem with the RFC 2684 Ethernet over ADSL bridge. </tp:docstring> |