Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

1 files changed, 43 insertions, 0 deletions

diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index 7b992456..33a4832f 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -72,6 +72,13 @@
 </td>
 </tr>
 <tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingVlan.html#nm-setting-vlan-get-protocol" title="nm_setting_vlan_get_protocol ()">nm_setting_vlan_get_protocol</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
 <td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="returnvalue">gint32</span></a>
 </td>
@@ -164,6 +171,10 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingVlan.html#NM-SETTING-VLAN-PROTOCOL:CAPS" title="NM_SETTING_VLAN_PROTOCOL">NM_SETTING_VLAN_PROTOCOL</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingVlan.html#NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS" title="NM_SETTING_VLAN_INGRESS_PRIORITY_MAP">NM_SETTING_VLAN_INGRESS_PRIORITY_MAP</a></td>
 </tr>
 <tr>
@@ -288,6 +299,32 @@ nm_setting_vlan_get_flags (<em class="parameter"><code><a class="link" href="NMS
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-setting-vlan-get-protocol"></a><h3>nm_setting_vlan_get_protocol ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_vlan_get_protocol (<em class="parameter"><code><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-vlan-get-protocol.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" 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="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-vlan-get-protocol.returns"></a><h4>Returns</h4>
+<p> the <span class="type">“protocol”</span> property of the setting</p>
+</div>
+<p class="since">Since: 1.42</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-setting-vlan-get-num-priorities"></a><h3>nm_setting_vlan_get_num_priorities ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="returnvalue">gint32</span></a>
 nm_setting_vlan_get_num_priorities (<em class="parameter"><code><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> *setting</code></em>,
@@ -680,6 +717,12 @@ is not a valid mapping.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-VLAN-PROTOCOL:CAPS"></a><h3>NM_SETTING_VLAN_PROTOCOL</h3>
+<pre class="programlisting">#define NM_SETTING_VLAN_PROTOCOL             "protocol"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS"></a><h3>NM_SETTING_VLAN_INGRESS_PRIORITY_MAP</h3>
 <pre class="programlisting">#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 </pre>