gre: eliminate holes in ip_tunnel

The structure can be packed denser by doing minor rearrangement
of existing elements.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 16435d8b1f935180d42dad87e962f64575de1b48..9ae9fbbccd6701dfd42fda7f7fd33605f7e7b5fc 100644 (file)
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -105,24 +105,23 @@ struct ip_tunnel {
        struct net_device       *dev;
        struct net              *net;   /* netns for packet i/o */
 
-       int             err_count;      /* Number of arrived ICMP errors */
        unsigned long   err_time;       /* Time when the last ICMP error
                                         * arrived */
+       int             err_count;      /* Number of arrived ICMP errors */
 
        /* These four fields used only by GRE */
        u32             i_seqno;        /* The last seen seqno  */
        u32             o_seqno;        /* The last output seqno */
        int             tun_hlen;       /* Precalculated header length */
-       int             mlink;
 
        struct dst_cache dst_cache;
 
        struct ip_tunnel_parm parms;
 
+       int             mlink;
        int             encap_hlen;     /* Encap header length (FOU,GUE) */
-       struct ip_tunnel_encap encap;
-
        int             hlen;           /* tun_hlen + encap_hlen */
+       struct ip_tunnel_encap encap;
 
        /* for SIT */
 #ifdef CONFIG_IPV6_SIT_6RD