diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-11-05 13:36:18 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-11-11 13:33:20 +0000 |
| commit | 6ddcce5b29278618ae2fb08058e48568aba0cd19 (patch) | |
| tree | 031baac64fede10936e2bbabf3b72610f01beaf3 /net/bridge | |
| parent | 9301343bc8d20d23c951dad6495b334ea797b5be (diff) | |
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 <ben@decadent.org.uk>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index a615264cf01a..2cf4e30ac41a 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -155,7 +155,7 @@ static struct dst_ops fake_dst_ops = { * ipt_REJECT needs it. Future netfilter modules might * require us to fill additional fields. */ -static const u32 br_dst_default_metrics[RTAX_MAX] = { +static const u32 br_dst_default_metrics[RTAX_MAX] __aligned(DST_METRICS_ALIGNMENT) = { [RTAX_MTU - 1] = 1500, }; |