New upstream version 1.19.90 upstream/1.19.90

1 files changed, 58 insertions, 3 deletions

diff --git a/docs/libnm/html/NMSettingEthtool.html b/docs/libnm/html/NMSettingEthtool.html
index 0644c606..05f77819 100644
--- a/docs/libnm/html/NMSettingEthtool.html
+++ b/docs/libnm/html/NMSettingEthtool.html
@@ -79,6 +79,13 @@
 <a class="link" href="NMSettingEthtool.html#nm-setting-ethtool-clear-features" title="nm_setting_ethtool_clear_features ()">nm_setting_ethtool_clear_features</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> **
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingEthtool.html#nm-setting-ethtool-get-optnames" title="nm_setting_ethtool_get_optnames ()">nm_setting_ethtool_get_optnames</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -330,12 +337,12 @@ nm_ethtool_optname_is_feature (<em class="parameter"><code>const <span class="ty
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>optname</p></td>
-<td class="parameter_description"><p>the option name to check</p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_description"><p>the option name to check. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr></tbody>
 </table></div>
 </div>
-<p class="since">Since: 1.14</p>
+<p class="since">Since: 1.20</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -358,6 +365,9 @@ nm_setting_ethtool_get_feature (<em class="parameter"><code><a class="link" href
                                 <em class="parameter"><code>const <span class="type">char</span> *optname</code></em>);</pre>
 <p>Gets and offload feature setting. Returns <a class="link" href="libnm-nm-dbus-interface.html#NM-TERNARY-DEFAULT:CAPS"><code class="literal">NM_TERNARY_DEFAULT</code></a> if the
 feature is not set.</p>
+<p>Note that <em class="parameter"><code>optname</code></em>
+ must be a valid name for a feature, according to
+<a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a>.</p>
 <div class="refsect3">
 <a name="nm-setting-ethtool-get-feature.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -395,6 +405,9 @@ nm_setting_ethtool_set_feature (<em class="parameter"><code><a class="link" href
                                 <em class="parameter"><code>const <span class="type">char</span> *optname</code></em>,
                                 <em class="parameter"><code><a class="link" href="libnm-nm-dbus-interface.html#NMTernary" title="enum NMTernary"><span class="type">NMTernary</span></a> value</code></em>);</pre>
 <p>Sets and offload feature setting.</p>
+<p>Note that <em class="parameter"><code>optname</code></em>
+ must be a valid name for a feature, according to
+<a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a>.</p>
 <div class="refsect3">
 <a name="nm-setting-ethtool-set-feature.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -448,6 +461,48 @@ nm_setting_ethtool_clear_features (<em class="parameter"><code><a class="link" h
 </div>
 <p class="since">Since: 1.14</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ethtool-get-optnames"></a><h3>nm_setting_ethtool_get_optnames ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> **
+nm_setting_ethtool_get_optnames (<em class="parameter"><code><a class="link" href="NMSettingEthtool.html" title="NMSettingEthtool"><span class="type">NMSettingEthtool</span></a> *setting</code></em>,
+                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *out_length</code></em>);</pre>
+<p>This returns all options names that are set. This includes the feature names
+like <a class="link" href="NMSettingEthtool.html#NM-ETHTOOL-OPTNAME-FEATURE-GRO:CAPS" title="NM_ETHTOOL_OPTNAME_FEATURE_GRO"><code class="literal">NM_ETHTOOL_OPTNAME_FEATURE_GRO</code></a>. See <a class="link" href="NMSettingEthtool.html#nm-ethtool-optname-is-feature" title="nm_ethtool_optname_is_feature ()"><code class="function">nm_ethtool_optname_is_feature()</code></a> to
+check whether the option name is valid for offload features.</p>
+<div class="refsect3">
+<a name="nm-setting-ethtool-get-optnames.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="NMSettingEthtool.html" title="NMSettingEthtool"><span class="type">NMSettingEthtool</span></a> instance.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>out_length</p></td>
+<td class="parameter_description"><p>return location for the number of keys returned, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ethtool-get-optnames.returns"></a><h4>Returns</h4>
+<p>list of set option
+names or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no options are set. The option names are still owned by
+<em class="parameter"><code>setting</code></em>
+and may get invalidated when <em class="parameter"><code>setting</code></em>
+gets modified. </p>
+<p><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.20</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingEthtool.other_details"></a><h2>Types and Values</h2>