diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-03-19 15:15:26 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-03-25 22:46:59 -0500 |
| commit | 4515099a3ea35026cd552573049172db903212fe (patch) | |
| tree | 3ec35ca3cdb89c513fd0482af91eeb2badbfdc67 | |
| parent | 95d199e04b4a43a211307873e6cf1918d6d241e0 (diff) | |
| download | NetworkManager-4515099a3ea35026cd552573049172db903212fe.tar.gz | |
dcb: clean up FCoE too
| -rw-r--r-- | src/nm-dcb.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/nm-dcb.c b/src/nm-dcb.c index 37b0379982..d29332f781 100644 --- a/src/nm-dcb.c +++ b/src/nm-dcb.c @@ -343,6 +343,14 @@ nm_dcb_setup (const char *iface, NMSettingDcb *s_dcb, GError **error) gboolean nm_dcb_cleanup (const char *iface, GError **error) { - return _dcb_cleanup (iface, run_helper, GUINT_TO_POINTER (DCBTOOL), error); + gboolean success; + + success = _dcb_cleanup (iface, run_helper, GUINT_TO_POINTER (DCBTOOL), error); + if (success) { + /* Only report FCoE errors if DCB cleanup was successful */ + success = _fcoe_cleanup (iface, run_helper, GUINT_TO_POINTER (FCOEADM), success ? error : NULL); + } + + return success; } |