diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-02 21:17:22 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-24 12:42:09 +0100 |
| commit | 0f5cf595a029552c56aae9d703e6162ae86c0280 (patch) | |
| tree | f0b75aa5c5765b8901e38b09067a7e638904d4cd | |
| parent | a30f327b740dc4ba5cdb7382f899b241e2da9928 (diff) | |
| download | NetworkManager-0f5cf595a029552c56aae9d703e6162ae86c0280.tar.gz | |
devices/arping-manager: log the device context
| -rw-r--r-- | src/devices/nm-arping-manager.c | 9 | ||||
| -rw-r--r-- | src/platform/wifi/wifi-utils-nl80211.c | 2 | ||||
| -rw-r--r-- | src/platform/wifi/wifi-utils-wext.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c index 0adbb961ac..51f80e08e4 100644 --- a/src/devices/nm-arping-manager.c +++ b/src/devices/nm-arping-manager.c @@ -81,13 +81,14 @@ G_DEFINE_TYPE (NMArpingManager, nm_arping_manager, G_TYPE_OBJECT) #define _NMLOG(level, ...) \ G_STMT_START { \ char _sbuf[64]; \ + int _ifindex = (self) ? NM_ARPING_MANAGER_GET_PRIVATE (self)->ifindex : 0; \ \ - nm_log ((level), _NMLOG_DOMAIN, NULL, NULL, \ + nm_log ((level), _NMLOG_DOMAIN, \ + nm_platform_link_get_name (NM_PLATFORM_GET, _ifindex), \ + NULL, \ "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ _NMLOG_PREFIX_NAME, \ - self ? nm_sprintf_buf (_sbuf, "[%p,%d]", \ - self, \ - NM_ARPING_MANAGER_GET_PRIVATE (self)->ifindex) : "" \ + self ? nm_sprintf_buf (_sbuf, "[%p,%d]", self, _ifindex) : "" \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } G_STMT_END diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c index 2dd6f60fd1..06eb7cb97c 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/wifi-utils-nl80211.c @@ -40,7 +40,7 @@ #define _NMLOG_PREFIX_NAME "wifi-nl80211" #define _NMLOG(level, domain, ...) \ G_STMT_START { \ - nm_log ((level), (domain), \ + nm_log ((level), (domain), NULL, NULL, \ "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ _NMLOG_PREFIX_NAME \ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c index 4475453dc6..1bc29ae8c3 100644 --- a/src/platform/wifi/wifi-utils-wext.c +++ b/src/platform/wifi/wifi-utils-wext.c @@ -71,7 +71,7 @@ struct iw_range_with_scan_capa #define _NMLOG_PREFIX_NAME "wifi-wext" #define _NMLOG(level, domain, ...) \ G_STMT_START { \ - nm_log ((level), (domain), \ + nm_log ((level), (domain), NULL, NULL, \ "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ _NMLOG_PREFIX_NAME \ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ |