diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 79f350d87..a07ba6e02 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -286,7 +286,8 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, - INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE. + INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, + TEAM, CONCHECK, DCB. In addition, these special domains can be used: NONE, ALL, DEFAULT, DHCP, IP. diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index cbb04a78e..446b15fa5 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -49,7 +49,8 @@ nm_log_handler (const gchar *log_domain, LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \ LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \ LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \ - LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK) + LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK | \ + LOGD_DCB) #define LOGD_DEFAULT (LOGD_ALL & ~(LOGD_WIFI_SCAN | LOGD_DBUS_PROPS)) @@ -105,6 +106,7 @@ static const LogDesc domain_descs[] = { { LOGD_DBUS_PROPS,"DBUS_PROPS" }, { LOGD_TEAM, "TEAM" }, { LOGD_CONCHECK, "CONCHECK" }, + { LOGD_DCB, "DCB" }, { 0, NULL } }; diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h index 1e3a16762..07cfbce99 100644 --- a/src/logging/nm-logging.h +++ b/src/logging/nm-logging.h @@ -61,6 +61,7 @@ enum { LOGD_DBUS_PROPS = (1LL << 31), LOGD_TEAM = (1LL << 32), LOGD_CONCHECK = (1LL << 33), + LOGD_DCB = (1LL << 34), /* Data Center Bridging */ }; #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)