[glib/wip/kdbus-junk: 13/37] [kdbus] Update kdbus interface header (commit: 017f56c7e53f) 14/10/20

[Ryan Lortie <desrt src gnome org>]

commit cce83618c05b702beda175e37e84fa46037cc209
Author: Lukasz Skalski <l skalski samsung com>
Date:   Mon Oct 20 10:44:40 2014 +0000

    [kdbus] Update kdbus interface header (commit: 017f56c7e53f) 14/10/20

 gio/kdbus.h |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gio/kdbus.h b/gio/kdbus.h
index 1ea4329..453a8d1 100644
--- a/gio/kdbus.h
+++ b/gio/kdbus.h
@@ -26,6 +26,7 @@
 #define KDBUS_DST_ID_NAME              (0)
 #define KDBUS_MATCH_ID_ANY             (~0ULL)
 #define KDBUS_DST_ID_BROADCAST         (~0ULL)
+#define KDBUS_FLAG_KERNEL              (1ULL << 63)
 
 /**
  * struct kdbus_notify_id_change - name registry change message
@@ -500,8 +501,6 @@ enum kdbus_policy_type {
  * enum kdbus_hello_flags - flags for struct kdbus_cmd_hello
  * @KDBUS_HELLO_ACCEPT_FD:     The connection allows the reception of
  *                             any passed file descriptors
- * @KDBUS_HELLO_ACCEPT_MEMFD:  The connection allows the reception of
- *                             any passed memfd file descriptors
  * @KDBUS_HELLO_ACTIVATOR:     Special-purpose connection which registers
  *                             a well-know name for a process to be started
  *                             when traffic arrives
@@ -516,10 +515,9 @@ enum kdbus_policy_type {
  */
 enum kdbus_hello_flags {
        KDBUS_HELLO_ACCEPT_FD           =  1ULL <<  0,
-       KDBUS_HELLO_ACCEPT_MEMFD        =  1ULL <<  1,
-       KDBUS_HELLO_ACTIVATOR           =  1ULL <<  2,
-       KDBUS_HELLO_POLICY_HOLDER       =  1ULL <<  3,
-       KDBUS_HELLO_MONITOR             =  1ULL <<  4,
+       KDBUS_HELLO_ACTIVATOR           =  1ULL <<  1,
+       KDBUS_HELLO_POLICY_HOLDER       =  1ULL <<  2,
+       KDBUS_HELLO_MONITOR             =  1ULL <<  3,
 };
 
 /**
@@ -557,7 +555,6 @@ enum kdbus_attach_flags {
 /**
  * struct kdbus_cmd_hello - struct to say hello to kdbus
  * @size:              The total size of the structure
- * @features:          Feature negotiation bitmask
  * @conn_flags:                Connection flags (KDBUS_HELLO_*).
  * @attach_flags:      Mask of metadata to attach to each message sent
  *                     (KDBUS_ATTACH_*)
@@ -577,7 +574,6 @@ enum kdbus_attach_flags {
  */
 struct kdbus_cmd_hello {
        __u64 size;
-       __u64 features;
        __u64 conn_flags;
        __u64 attach_flags;
        __u64 bus_flags;
@@ -601,7 +597,6 @@ enum kdbus_make_flags {
 /**
  * struct kdbus_cmd_make - struct to make a bus, an endpoint or a domain
  * @size:              The total size of the struct
- * @features:          Feature negotiation bitmask
  * @flags:             Properties for the bus/ep/domain to create
  * @items:             Items describing details
  *
@@ -610,7 +605,6 @@ enum kdbus_make_flags {
  */
 struct kdbus_cmd_make {
        __u64 size;
-       __u64 features;
        __u64 flags;
        struct kdbus_item items[0];
 } __attribute__((aligned(8)));