openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
stephen hemminger 2016-04-13 17:02:21 -07:00 committed by David S. Miller
parent d0988a5f77
commit f38ba953be
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/ip_tunnels.h
View File

@ -105,24 +105,23 @@ struct ip_tunnel {
struct net_device *dev; struct net_device *dev;
struct net *net; /* netns for packet i/o */ 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 unsigned long err_time; /* Time when the last ICMP error
* arrived */ * arrived */
int err_count; /* Number of arrived ICMP errors */
/* These four fields used only by GRE */ /* These four fields used only by GRE */
u32 i_seqno; /* The last seen seqno */ u32 i_seqno; /* The last seen seqno */
u32 o_seqno; /* The last output seqno */ u32 o_seqno; /* The last output seqno */
int tun_hlen; /* Precalculated header length */ int tun_hlen; /* Precalculated header length */
int mlink;
struct dst_cache dst_cache; struct dst_cache dst_cache;
struct ip_tunnel_parm parms; struct ip_tunnel_parm parms;
int mlink;
int encap_hlen; /* Encap header length (FOU,GUE) */ int encap_hlen; /* Encap header length (FOU,GUE) */
struct ip_tunnel_encap encap;
int hlen; /* tun_hlen + encap_hlen */ int hlen; /* tun_hlen + encap_hlen */
struct ip_tunnel_encap encap;
/* for SIT */ /* for SIT */
#ifdef CONFIG_IPV6_SIT_6RD #ifdef CONFIG_IPV6_SIT_6RD