Pull style into test branch

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

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index bef9f8fd93b3ed08d0b5a723df4d0e153413c3af..8de079ba11076e2ee4a6f5d4d9c2703eafbca999 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -19,10 +19,10 @@ struct ip_tunnel_parm
 {
        char                    name[IFNAMSIZ];
        int                     link;
-       __u16                   i_flags;
-       __u16                   o_flags;
-       __u32                   i_key;
-       __u32                   o_key;
+       __be16                  i_flags;
+       __be16                  o_flags;
+       __be32                  i_key;
+       __be32                  o_key;
        struct iphdr            iph;
 };