diff options
| author | Dan Winship <danw@redhat.com> | 2015-04-16 08:35:49 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-04-16 08:35:49 -0400 |
| commit | 1ba48dbfed4a01eca38ab5f5f69c03c96bb70421 (patch) | |
| tree | 819e625616d21d1ee841c9ba05aab262697aba19 | |
| parent | a0b2463325ee3e4dd551f001500096b187cf17ba (diff) | |
| download | NetworkManager-danw/no-wimax-bgo747846.tar.gz | |
fixup! wimax: drop WiMAX supportdanw/no-wimax-bgo747846
change handling of WIMAX log domain
| -rw-r--r-- | src/nm-logging.c | 3 | ||||
| -rw-r--r-- | src/nm-logging.h | 23 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/nm-logging.c b/src/nm-logging.c index 2d0455e148..d4bbbe3b2c 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -89,7 +89,6 @@ static const LogDesc domain_descs[] = { { LOGD_CORE, "CORE" }, { LOGD_DEVICE, "DEVICE" }, { LOGD_OLPC, "OLPC" }, - { LOGD_UNUSED1, "WIMAX" }, { LOGD_INFINIBAND,"INFINIBAND" }, { LOGD_FIREWALL, "FIREWALL" }, { LOGD_ADSL, "ADSL" }, @@ -206,6 +205,8 @@ nm_logging_setup (const char *level, /* Check for compatibility domains */ else if (!g_ascii_strcasecmp (*iter, "HW")) bits = LOGD_PLATFORM; + else if (!g_ascii_strcasecmp (*iter, "WIMAX")) + continue; else { for (diter = &domain_descs[0]; diter->name; diter++) { diff --git a/src/nm-logging.h b/src/nm-logging.h index 5cd67789f4..4bdac3fe15 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -57,18 +57,17 @@ typedef enum { /*< skip >*/ LOGD_CORE = (1LL << 20), /* Core daemon and policy stuff */ LOGD_DEVICE = (1LL << 21), /* Device state and activation */ LOGD_OLPC = (1LL << 22), - LOGD_UNUSED1 = (1LL << 23), - LOGD_INFINIBAND = (1LL << 24), - LOGD_FIREWALL = (1LL << 25), - LOGD_ADSL = (1LL << 26), - LOGD_BOND = (1LL << 27), - LOGD_VLAN = (1LL << 28), - LOGD_BRIDGE = (1LL << 29), - LOGD_DBUS_PROPS = (1LL << 30), - LOGD_TEAM = (1LL << 31), - LOGD_CONCHECK = (1LL << 32), - LOGD_DCB = (1LL << 33), /* Data Center Bridging */ - LOGD_DISPATCH = (1LL << 34), + LOGD_INFINIBAND = (1LL << 23), + LOGD_FIREWALL = (1LL << 24), + LOGD_ADSL = (1LL << 25), + LOGD_BOND = (1LL << 26), + LOGD_VLAN = (1LL << 27), + LOGD_BRIDGE = (1LL << 28), + LOGD_DBUS_PROPS = (1LL << 29), + LOGD_TEAM = (1LL << 30), + LOGD_CONCHECK = (1LL << 31), + LOGD_DCB = (1LL << 32), /* Data Center Bridging */ + LOGD_DISPATCH = (1LL << 33), __LOGD_MAX, LOGD_ALL = ((__LOGD_MAX - 1LL) << 1) - 1LL, |