diff options
author | Dan Williams <dcbw@redhat.com> | 2010-06-09 20:59:35 -0700 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2010-06-09 20:59:35 -0700 |
commit | c1542cd268275f4cded3f316b9c4bcaf738b0aa6 (patch) | |
tree | 28cb012baa07533325aeb2a42ab063214ff34cc7 | |
parent | d9846df5b0b647556a41b3640a32c770dd8eb372 (diff) | |
download | NetworkManager-c1542cd268275f4cded3f316b9c4bcaf738b0aa6.tar.gz |
core: NL_CB_VERBOSE breaks error propagation (rh #594578)
Plus we don't really need the VERBOSE bits anyway.
-rw-r--r-- | src/nm-netlink-monitor.c | 2 | ||||
-rw-r--r-- | src/nm-netlink.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index aed3230fb7..91ea55ffb8 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -252,7 +252,7 @@ nm_netlink_monitor_open_connection (NMNetlinkMonitor *monitor, priv = NM_NETLINK_MONITOR_GET_PRIVATE (monitor); g_return_val_if_fail (priv->io_channel == NULL, FALSE); - priv->nlh_cb = nl_cb_alloc (NL_CB_VERBOSE); + priv->nlh_cb = nl_cb_alloc (NL_CB_DEFAULT); priv->nlh = nl_handle_alloc_cb (priv->nlh_cb); if (!priv->nlh) { g_set_error (error, NM_NETLINK_MONITOR_ERROR, diff --git a/src/nm-netlink.c b/src/nm-netlink.c index 643b3632a1..57194da54a 100644 --- a/src/nm-netlink.c +++ b/src/nm-netlink.c @@ -62,7 +62,7 @@ nm_netlink_get_default_handle (void) if (def_nl_handle) return def_nl_handle; - cb = nl_cb_alloc(NL_CB_VERBOSE); + cb = nl_cb_alloc(NL_CB_DEFAULT); def_nl_handle = nl_handle_alloc_cb (cb); if (!def_nl_handle) { nm_warning ("couldn't allocate netlink handle."); |