summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJiri Benc <jbenc@redhat.com>2015-08-20 13:56:20 +0200
committerDavid S. Miller <davem@davemloft.net>2015-08-21 00:42:35 +0200
commitac1cf3990c99802eae3aa735b35c94a2131eb9fe (patch)
tree56eefb7e6af634aa2f4fcac9d9f7c700cfcf7e38 /include
parentnet: xgene Remove xgene specific phy and MAC lookup functions (diff)
downloadlinux-ac1cf3990c99802eae3aa735b35c94a2131eb9fe.tar.xz
linux-ac1cf3990c99802eae3aa735b35c94a2131eb9fe.zip
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')
-rw-r--r--include/net/ip_tunnels.h2
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 {
__u8 ipv4_ttl;
__be16 tp_src;
__be16 tp_dst;
-} __packed __aligned(4); /* Minimize padding. */
+};
/* Indicates whether the tunnel info structure represents receive
* or transmit tunnel parameters.