diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-05-15 15:48:37 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-05-15 18:15:21 +0200 |
| commit | af4e9e2c563047d524b207e0e3d6816385693a16 (patch) | |
| tree | 091392995240d050ae888c8dcba4c1899b6ed7e9 /src/network/networkd.h | |
| parent | 7e28adeb63818ee96dac015c0766be461e13fb64 (diff) | |
networkd: rename NetDev variable for consistency with Link
Diffstat (limited to 'src/network/networkd.h')
| -rw-r--r-- | src/network/networkd.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/networkd.h b/src/network/networkd.h index 11d0056c9c..c5f2d076d0 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -97,7 +97,7 @@ struct NetDev { Condition *match_arch; char *description; - char *name; + char *ifname; size_t mtu; NetDevKind kind; @@ -435,16 +435,16 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref); /* More macros which append INTERFACE= to the message */ -#define log_full_netdev(level, netdev, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->name, "%s: " fmt, netdev->name, ##__VA_ARGS__) +#define log_full_netdev(level, netdev, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->ifname, "%s: " fmt, netdev->ifname, ##__VA_ARGS__) #define log_debug_netdev(netdev, ...) log_full_netdev(LOG_DEBUG, netdev, ##__VA_ARGS__) #define log_info_netdev(netdev, ...) log_full_netdev(LOG_INFO, netdev, ##__VA_ARGS__) #define log_notice_netdev(netdev, ...) log_full_netdev(LOG_NOTICE, netdev, ##__VA_ARGS__) #define log_warning_netdev(netdev, ...) log_full_netdev(LOG_WARNING, netdev,## __VA_ARGS__) #define log_error_netdev(netdev, ...) log_full_netdev(LOG_ERR, netdev, ##__VA_ARGS__) -#define log_struct_netdev(level, netdev, ...) log_struct(level, "INTERFACE=%s", netdev->name, __VA_ARGS__) +#define log_struct_netdev(level, netdev, ...) log_struct(level, "INTERFACE=%s", netdev->ifname, __VA_ARGS__) -#define NETDEV(netdev) "INTERFACE=%s", netdev->name +#define NETDEV(netdev) "INTERFACE=%s", netdev->ifname #define ADDRESS_FMT_VAL(address) \ (address).s_addr & 0xFF, \ ((address).s_addr >> 8) & 0xFF, \ |