Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes

[linux-2.6] / include / linux / netlink.h

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index bd13b6f4a98ec0932503273858988795bcc5bf35..bec1062a25a1e83146e8478f2bb8443a05fcf288 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -166,6 +166,7 @@ struct netlink_skb_parms
        __u32                   dst_group;
        kernel_cap_t            eff_cap;
        __u32                   loginuid;       /* Login (audit) uid */
+       __u32                   sessionid;      /* Session id (audit) */
        __u32                   sid;            /* SELinux security id */
 };
 
@@ -219,7 +220,7 @@ struct netlink_callback
        int             (*dump)(struct sk_buff * skb, struct netlink_callback *cb);
        int             (*done)(struct netlink_callback *cb);
        int             family;
-       long            args[5];
+       long            args[6];
 };
 
 struct netlink_notify