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

network-manager Debian release 1.42.4-1

1 files changed, 47 insertions, 2 deletions

diff --git a/docs/libnm/html/NMSettingOvsInterface.html b/docs/libnm/html/NMSettingOvsInterface.html
index acb3fff9..d1d7be22 100644
--- a/docs/libnm/html/NMSettingOvsInterface.html
+++ b/docs/libnm/html/NMSettingOvsInterface.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOvsExternalIDs.html" title="NMSettingOvsExternalIDs">
-<link rel="next" href="NMSettingOvsPatch.html" title="NMSettingOvsPatch">
+<link rel="next" href="NMSettingOvsOtherConfig.html" title="NMSettingOvsOtherConfig">
 <meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,7 +20,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="NMSettingOvsExternalIDs.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="NMSettingOvsPatch.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMSettingOvsOtherConfig.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="NMSettingOvsInterface"></a><div class="titlepage"></div>
@@ -54,6 +54,14 @@
 <a class="link" href="NMSettingOvsInterface.html#nm-setting-ovs-interface-get-interface-type" title="nm_setting_ovs_interface_get_interface_type ()">nm_setting_ovs_interface_get_interface_type</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#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingOvsInterface.html#nm-setting-ovs-interface-get-ofport-request" title="nm_setting_ovs_interface_get_ofport_request ()">nm_setting_ovs_interface_get_ofport_request</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -73,6 +81,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingOvsInterface.html#NM-SETTING-OVS-INTERFACE-TYPE:CAPS" title="NM_SETTING_OVS_INTERFACE_TYPE">NM_SETTING_OVS_INTERFACE_TYPE</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingOvsInterface.html#NM-SETTING-OVS-INTERFACE-OFPORT-REQUEST:CAPS" title="NM_SETTING_OVS_INTERFACE_OFPORT_REQUEST">NM_SETTING_OVS_INTERFACE_OFPORT_REQUEST</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -122,6 +134,33 @@ nm_setting_ovs_interface_get_interface_type
 </div>
 <p class="since">Since: 1.10</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ovs-interface-get-ofport-request"></a><h3>nm_setting_ovs_interface_get_ofport_request ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_setting_ovs_interface_get_ofport_request
+                               (<em class="parameter"><code><a class="link" href="NMSettingOvsInterface.html" title="NMSettingOvsInterface"><span class="type">NMSettingOvsInterface</span></a> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ovs-interface-get-ofport-request.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>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingOvsInterface.html" title="NMSettingOvsInterface"><span class="type">NMSettingOvsInterface</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ovs-interface-get-ofport-request.returns"></a><h4>Returns</h4>
+<p> id of the preassigned ovs port</p>
+</div>
+<p class="since">Since: 1.42</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingOvsInterface.other_details"></a><h2>Types and Values</h2>
@@ -136,6 +175,12 @@ nm_setting_ovs_interface_get_interface_type
 <pre class="programlisting">#define NM_SETTING_OVS_INTERFACE_TYPE "type"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-OVS-INTERFACE-OFPORT-REQUEST:CAPS"></a><h3>NM_SETTING_OVS_INTERFACE_OFPORT_REQUEST</h3>
+<pre class="programlisting">#define NM_SETTING_OVS_INTERFACE_OFPORT_REQUEST "ofport-request"
+</pre>
+</div>
 </div>
 </div>
 <div class="footer">