Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...

[linux.git] / include / net / xfrm.h

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 3878a88ff61838e44440a9ebadd4d8c37d23b2a0..15ec19dcf9c886864374a044e636c941ab8e0903 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -310,6 +310,8 @@ struct xfrm_tmpl
 /* Source address of tunnel. Ignored, if it is not a tunnel. */
        xfrm_address_t          saddr;
 
+       unsigned short          encap_family;
+
        __u32                   reqid;
 
 /* Mode: transport, tunnel etc. */
@@ -340,18 +342,19 @@ struct xfrm_policy
        atomic_t                refcnt;
        struct timer_list       timer;
 
-       u8                      type;
        u32                     priority;
        u32                     index;
        struct xfrm_selector    selector;
        struct xfrm_lifetime_cfg lft;
        struct xfrm_lifetime_cur curlft;
        struct dst_entry       *bundles;
-       __u16                   family;
-       __u8                    action;
-       __u8                    flags;
-       __u8                    dead;
-       __u8                    xfrm_nr;
+       u16                     family;
+       u8                      type;
+       u8                      action;
+       u8                      flags;
+       u8                      dead;
+       u8                      xfrm_nr;
+       /* XXX 1 byte hole, try to pack */
        struct xfrm_sec_ctx     *security;
        struct xfrm_tmpl        xfrm_vec[XFRM_MAX_DEPTH];
 };