diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 00:42:49 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 00:42:49 -0500 |
| commit | ccef261c077d31dce02aa92e519b23b3a2a58303 (patch) | |
| tree | 582fafc98c76e98e912f453fb55ca57f29273d57 /src/network/networkd-netdev.h | |
| parent | 5d4922bba91c6d60b3b9f38fb29fda0f6ba8338d (diff) | |
| parent | 5fb2a20a29c2cc0494d5a31e175a8e3ff0b2d3e2 (diff) | |
Merge tag 'systemd/v232-4.parabola1' into systemd/parabola
Diffstat (limited to 'src/network/networkd-netdev.h')
| -rw-r--r-- | src/network/networkd-netdev.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h index b92a973b85..70ff947b99 100644 --- a/src/network/networkd-netdev.h +++ b/src/network/networkd-netdev.h @@ -56,6 +56,7 @@ typedef enum NetDevKind { NETDEV_KIND_TUN, NETDEV_KIND_TAP, NETDEV_KIND_VRF, + NETDEV_KIND_VCAN, _NETDEV_KIND_MAX, _NETDEV_KIND_INVALID = -1 } NetDevKind; @@ -180,8 +181,8 @@ const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsign #define log_netdev_full(netdev, level, error, ...) \ ({ \ - NetDev *_n = (netdev); \ - _n ? log_object_internal(level, error, __FILE__, __LINE__, __func__, "INTERFACE=", _n->ifname, ##__VA_ARGS__) : \ + const NetDev *_n = (netdev); \ + _n ? log_object_internal(level, error, __FILE__, __LINE__, __func__, "INTERFACE=", _n->ifname, NULL, NULL, ##__VA_ARGS__) : \ log_internal(level, error, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \ }) |