Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 114 insertions, 7 deletions

diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index f6ab97cc..8c845502 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -249,6 +249,14 @@
 <a class="link" href="NMSettingConnection.html#nm-setting-connection-get-metered" title="nm_setting_connection_get_metered ()">nm_setting_connection_get_metered</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp"><span class="returnvalue">NMSettingConnectionLldp</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingConnection.html#nm-setting-connection-get-lldp" title="nm_setting_connection_get_lldp ()">nm_setting_connection_get_lldp</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -294,6 +302,11 @@
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
+<td class="property_type"><span class="type">gint</span></td>
+<td class="property_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection--lldp" title="The “lldp” property">lldp</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
 <td class="property_type">
 <span class="type">gchar</span> *</td>
 <td class="property_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection--master" title="The “master” property">master</a></td>
@@ -440,10 +453,18 @@
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-METERED:CAPS" title="NM_SETTING_CONNECTION_METERED">NM_SETTING_CONNECTION_METERED</a></td>
 </tr>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingConnection.html#NM-SETTING-CONNECTION-LLDP:CAPS" title="NM_SETTING_CONNECTION_LLDP">NM_SETTING_CONNECTION_LLDP</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves">NMSettingConnectionAutoconnectSlaves</a></td>
 </tr>
 <tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp">NMSettingConnectionLldp</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword">struct</td>
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="struct NMSettingConnection">NMSettingConnection</a></td>
 </tr>
@@ -452,8 +473,9 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GEnum
-    <span class="lineart">╰──</span> NMSettingConnectionAutoconnectSlaves
+<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    <span class="lineart">├──</span> NMSettingConnectionAutoconnectSlaves
+    <span class="lineart">╰──</span> NMSettingConnectionLldp
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSettingConnection
@@ -1089,7 +1111,7 @@ nm_setting_connection_get_autoconnect_slaves
 <p> whether slaves of the connection should be activated together
 with the connection.</p>
 </div>
-<p class="since">Since: 1.0.4</p>
+<p class="since">Since: 1.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1305,7 +1327,35 @@ nm_setting_connection_get_metered (<em class="parameter"><code><a class="link" h
 <a name="id-1.4.5.8.28.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSettingConnection.html#NMSettingConnection--metered" title="The “metered” property"><span class="type">“metered”</span></a> property of the setting.</p>
 </div>
-<p class="since">Since: 1.0.6</p>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-connection-get-lldp"></a><h3>nm_setting_connection_get_lldp ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp"><span class="returnvalue">NMSettingConnectionLldp</span></a>
+nm_setting_connection_get_lldp (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>);</pre>
+<p>Returns the <a class="link" href="NMSettingConnection.html#NMSettingConnection--lldp" title="The “lldp” property"><span class="type">“lldp”</span></a> property of the connection.</p>
+<div class="refsect3">
+<a name="id-1.4.5.8.29.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.5.8.29.6"></a><h4>Returns</h4>
+<p> a <a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp"><code class="literal">NMSettingConnectionLldp</code></a> which indicates whether LLDP must be
+enabled for the connection.</p>
+</div>
+<p class="since">Since: 1.2</p>
 </div>
 </div>
 <div class="refsect1">
@@ -1431,11 +1481,17 @@ nm_setting_connection_get_metered (<em class="parameter"><code><a class="link" h
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-CONNECTION-LLDP:CAPS"></a><h3>NM_SETTING_CONNECTION_LLDP</h3>
+<pre class="programlisting">#define NM_SETTING_CONNECTION_LLDP           "lldp"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnectionAutoconnectSlaves"></a><h3>enum NMSettingConnectionAutoconnectSlaves</h3>
 <p><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a> values indicate whether slave connections
 should be activated when master is activated.</p>
 <div class="refsect3">
-<a name="id-1.4.5.9.22.4"></a><h4>Members</h4>
+<a name="id-1.4.5.9.23.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1472,6 +1528,44 @@ should be activated when master is activated.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingConnectionLldp"></a><h3>enum NMSettingConnectionLldp</h3>
+<p><a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp"><span class="type">NMSettingConnectionLldp</span></a> values indicate whether LLDP should be enabled.</p>
+<div class="refsect3">
+<a name="id-1.4.5.9.24.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-LLDP-DEFAULT:CAPS"></a>NM_SETTING_CONNECTION_LLDP_DEFAULT</p></td>
+<td class="enum_member_description">
+<p>default value</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-LLDP-DISABLE:CAPS"></a>NM_SETTING_CONNECTION_LLDP_DISABLE</p></td>
+<td class="enum_member_description">
+<p>disable LLDP</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-LLDP-ENABLE-RX:CAPS"></a>NM_SETTING_CONNECTION_LLDP_ENABLE_RX</p></td>
+<td class="enum_member_description">
+<p>enable reception of LLDP frames</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection-struct"></a><h3>struct NMSettingConnection</h3>
 <pre class="programlisting">struct NMSettingConnection;</pre>
 <p>The NMSettingConnection struct contains only private data.
@@ -1514,7 +1608,7 @@ If -1 (default) is set, global connection.autoconnect-slaves is read to
 determine the real value. If it is default as well, this fallbacks to 0.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT</p>
-<p class="since">Since: 1.0.4</p>
+<p class="since">Since: 1.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1553,6 +1647,15 @@ connection may be applied to the wrong interface.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingConnection--lldp"></a><h3>The <code class="literal">“lldp”</code> property</h3>
+<pre class="programlisting">  “lldp”                     <span class="type">gint</span></pre>
+<p>Whether LLDP is enabled for the connection.</p>
+<p>Flags: Read / Write / Construct</p>
+<p>Default value: -1</p>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingConnection--master"></a><h3>The <code class="literal">“master”</code> property</h3>
 <pre class="programlisting">  “master”                   <span class="type">gchar</span> *</pre>
 <p>Interface name of the master device or UUID of the master connection.</p>
@@ -1564,9 +1667,11 @@ connection may be applied to the wrong interface.</p>
 <a name="NMSettingConnection--metered"></a><h3>The <code class="literal">“metered”</code> property</h3>
 <pre class="programlisting">  “metered”                  <a class="link" href="libnm-nm-dbus-interface.html#NMMetered" title="enum NMMetered"><span class="type">NMMetered</span></a></pre>
 <p>Whether the connection is metered.</p>
+<p>When updating this property on a currently activated connection,
+the change takes effect immediately.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NM_METERED_UNKNOWN</p>
-<p class="since">Since: 1.0.6</p>
+<p class="since">Since: 1.2</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -1664,6 +1769,8 @@ be generated by <a class="link" href="libnm-nm-utils.html#nm-utils-uuid-generate
 (for example "Home", "Work", "Public").  <code class="literal">NULL</code> or unspecified zone means
 the connection will be placed in the default zone as defined by the
 firewall.</p>
+<p>When updating this property on a currently activated connection,
+the change takes effect immediately.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: NULL</p>
 </div>