From 6ddcce5b29278618ae2fb08058e48568aba0cd19 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 5 Nov 2017 13:36:18 +0000 Subject: dst: Increase alignment of metrics to allow extra flag on pointers For the backport of "ipv4: add reference counting to metrics", we will need a third flag on metrics pointers. This was not needed upstream as the DST_METRICS_FORCE_OVERWRITE flag has been eliminated there. In order to use three flag bits we need to increase the alignment of metrics from 4 to 8 bytes. Signed-off-by: Ben Hutchings --- net/ipv6/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/ipv6/route.c') diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a66142e53216..90e59ea3adbc 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -247,7 +247,7 @@ static struct dst_ops ip6_dst_blackhole_ops = { .neigh_lookup = ip6_neigh_lookup, }; -static const u32 ip6_template_metrics[RTAX_MAX] = { +static const u32 ip6_template_metrics[RTAX_MAX] __aligned(DST_METRICS_ALIGNMENT) = { [RTAX_HOPLIMIT - 1] = 0, }; -- cgit v1.2.3