Skip to content

Commit

Permalink
ip_tunnels: remove custom alignment and packing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Benc authored and David S. Miller committed Aug 20, 2015
1 parent 938049e commit ac1cf39
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/net/ip_tunnels.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit ac1cf39

Please sign in to comment.