diff options
author | Kay Sievers <kay@vrfy.org> | 2013-04-16 01:44:36 +0200 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2013-04-16 01:44:36 +0200 |
commit | 68cfd33173766acbc54a30a989a39561b6d98253 (patch) | |
tree | 1f29b4df79b60a219bd138529d84ef61a7ebe328 /src/libsystemd-bus/kdbus.h | |
parent | c4d58b0b6d238b955ece39a9dd9d3ca84b3408f3 (diff) |
bus: catch up with kernel changes
Diffstat (limited to 'src/libsystemd-bus/kdbus.h')
-rw-r--r-- | src/libsystemd-bus/kdbus.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h index aac7b84352..305ded720e 100644 --- a/src/libsystemd-bus/kdbus.h +++ b/src/libsystemd-bus/kdbus.h @@ -63,7 +63,7 @@ struct kdbus_timestamp { #define KDBUS_MATCH_SRC_ID_ANY (~0ULL) #define KDBUS_DST_ID_BROADCAST (~0ULL) -/* Message Data Types */ +/* Message Item Types */ enum { /* Filled in by userspace */ KDBUS_MSG_NULL, /* empty record */ @@ -103,12 +103,12 @@ struct kdbus_vec { }; /** - * struct kdbus_msg_data - chain of data blocks + * struct kdbus_msg_item - chain of data blocks * * size: overall data record size - * type: kdbus_msg_data_type of data + * type: kdbus_msg_item type of data */ -struct kdbus_msg_data { +struct kdbus_msg_item { __u64 size; __u64 type; union { @@ -148,8 +148,7 @@ enum { * set by userspace: * dst_id: destination id * flags: KDBUS_MSG_FLAGS_* - * data_size: overall message size - * data: data records + * items: data records * * set by kernel: * src_id: who sent the message @@ -165,7 +164,7 @@ struct kdbus_msg { __u64 cookie_reply; /* cookie we reply to */ __u64 timeout_ns; /* timespan to wait for reply */ }; - struct kdbus_msg_data items[0]; + struct kdbus_msg_item items[0]; }; enum { |