Merge tag 'upstream/0.9.10.0'

Upstream version 0.9.10.0

1 files changed, 50 insertions, 2 deletions

diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index b03b1b84..f459bce4 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -51,9 +51,9 @@
         Flags describing the capabilities of the device.
       </tp:docstring>
     </property>
-    <property name="Ip4Address" type="i" access="read">
+    <property name="Ip4Address" type="u" access="read">
       <tp:docstring>
-        The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
+        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.
       </tp:docstring>
     </property>
     <property name="State" type="u" access="read" tp:type="NM_DEVICE_STATE">
@@ -125,6 +125,19 @@
         An array of object paths of every configured connection that is currently 'available' through this device.
       </tp:docstring>
     </property>
+    <property name="PhysicalPortId" type="s" access="read">
+      <tp:docstring>
+        If non-empty, an (opaque) indicator of the physical network
+        port associated with the device. This can be used to recognize
+	when two seemingly-separate hardware devices are actually just
+	different virtual interfaces to the same physical port.
+      </tp:docstring>
+    </property>
+    <property name="Mtu" type="u" access="read">
+      <tp:docstring>
+        The device MTU (maximum transmission unit).
+      </tp:docstring>
+    </property>
 
     <method name="Disconnect">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_disconnect"/>
@@ -289,6 +302,16 @@
           The device is a bridge interface.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="GENERIC" value="14">
+        <tp:docstring>
+          The device is a generic interface type unrecognized by NetworkManager.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="TEAM" value="15">
+        <tp:docstring>
+          The device is a team master interface.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
     <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">
@@ -579,6 +602,31 @@
           A secondary connection of the base connection failed.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="DCB_FCOE_FAILED" value="55">
+        <tp:docstring>
+          DCB or FCoE setup failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="TEAMD_CONTROL_FAILED" value="56">
+        <tp:docstring>
+          teamd control failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_FAILED" value="57">
+        <tp:docstring>
+          Modem failed or no longer available.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="MODEM_AVAILABLE" value="58">
+        <tp:docstring>
+          Modem now ready and available.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SIM_PIN_INCORRECT" value="59">
+        <tp:docstring>
+          The SIM PIN was incorrect.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
     <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">