diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /libnm-core/nm-setting-wired.c | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'libnm-core/nm-setting-wired.c')
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index fcd8e837..5569f558 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -565,10 +565,12 @@ nm_setting_wired_remove_s390_option (NMSettingWired *setting, /** * nm_setting_wired_get_valid_s390_options: - * @setting: the #NMSettingWired + * @setting: (allow-none): the #NMSettingWired * * Returns a list of valid s390 options. * + * The @setting argument is unused and %NULL may be passed instead. + * * Returns: (transfer none): a %NULL-terminated array of strings of valid s390 options. **/ const char ** |