diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-13 21:33:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:53:37 -0800 |
| commit | b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b (patch) | |
| tree | c057ff62b03582493b74005f7959a0207e748468 /net/ipv6/xfrm6_policy.c | |
| parent | 550ade8432a2a6fbfb48ba7018750b0e8c81e8d0 (diff) | |
| download | op-kernel-dev-b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b.zip op-kernel-dev-b4ce92775c2e7ff9cf79cca4e0a19c8c5fd6287b.tar.gz | |
[IPV6]: Move nfheader_len into rt6_info
The dst member nfheader_len is only used by IPv6. It's also currently
creating a rather ugly alignment hole in struct dst. Therefore this patch
moves it from there into struct rt6_info.
It also reorders the fields in rt6_info to minimize holes.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 3cad3e8..5b02f0e 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -157,7 +157,8 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int dst_prev = dst1; if (xfrm[i]->type->flags & XFRM_TYPE_NON_FRAGMENT) - dst->nfheader_len += xfrm[i]->props.header_len; + ((struct rt6_info *)dst)->nfheader_len += + xfrm[i]->props.header_len; header_len += xfrm[i]->props.header_len; trailer_len += xfrm[i]->props.trailer_len; |
