diff options
| author | Michael Biebl <biebl@debian.org> | 2022-01-13 22:30:39 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-01-13 22:30:39 +0100 |
| commit | 88c227d90a6b7b388c5c85d72802a0ca8f05ed5c (patch) | |
| tree | 71f32df6617802270e8a78574bd8e1637dc532f4 /src/core/nm-dcb.c | |
| parent | e74c568b07b50b97873fb4ee1d776dedefbd54d6 (diff) | |
New upstream version 1.34.0 upstream/1.34.0
Diffstat (limited to 'src/core/nm-dcb.c')
| -rw-r--r-- | src/core/nm-dcb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/nm-dcb.c b/src/core/nm-dcb.c index 930a1023..f048d999 100644 --- a/src/core/nm-dcb.c +++ b/src/core/nm-dcb.c @@ -35,7 +35,7 @@ do_helper(const char *iface, cmdline = g_strdup_vprintf(fmt, args); va_end(args); - split = nm_utils_strsplit_set_with_empty(cmdline, " "); + split = nm_strsplit_set_with_empty(cmdline, " "); if (!split) { g_set_error(error, NM_MANAGER_ERROR, @@ -258,7 +258,8 @@ _fcoe_setup(const char * iface, flags = nm_setting_dcb_get_app_fcoe_flags(s_dcb); if (flags & NM_SETTING_DCB_FLAG_ENABLE) { - const char *mode = nm_setting_dcb_get_app_fcoe_mode(s_dcb); + const char *mode = + nm_setting_dcb_get_app_fcoe_mode(s_dcb) ?: NM_SETTING_DCB_FCOE_MODE_FABRIC; if (!do_helper(NULL, FCOEADM, run_func, user_data, error, "-m %s -c %s", mode, iface)) return FALSE; |