diff options
author | Jiri Benc <jbenc@redhat.com> | 2015-08-20 07:56:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-20 18:42:35 -0400 |
commit | ac1cf3990c99802eae3aa735b35c94a2131eb9fe (patch) | |
tree | 56eefb7e6af634aa2f4fcac9d9f7c700cfcf7e38 /include/net/ip_tunnels.h | |
parent | 938049e18dca57bcd2f93986fc1cbb5a83cdf027 (diff) |
ip_tunnels: remove custom alignment and packing
The custom alignment of struct ip_tunnel_key is unnecessary. In struct
sw_flow_key, it starts at offset 256, in struct ip_tunnel_info it's the
first field.
The structure is also packed even without the __packed keyword.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip_tunnels.h')
-rw-r--r-- | include/net/ip_tunnels.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 984dbfa15e13..81cf11c931e4 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h | |||
@@ -36,7 +36,7 @@ struct ip_tunnel_key { | |||
36 | __u8 ipv4_ttl; | 36 | __u8 ipv4_ttl; |
37 | __be16 tp_src; | 37 | __be16 tp_src; |
38 | __be16 tp_dst; | 38 | __be16 tp_dst; |
39 | } __packed __aligned(4); /* Minimize padding. */ | 39 | }; |
40 | 40 | ||
41 | /* Indicates whether the tunnel info structure represents receive | 41 | /* Indicates whether the tunnel info structure represents receive |
42 | * or transmit tunnel parameters. | 42 | * or transmit tunnel parameters. |