aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-13 21:33:01 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:53:36 -0800
commit550ade8432a2a6fbfb48ba7018750b0e8c81e8d0 (patch)
tree092838fb75d0352858dc473f32a78d1bc1db05f3 /net
parent[IPV6]: Only set nfheader_len for top xfrm dst (diff)
downloadlinux-dev-550ade8432a2a6fbfb48ba7018750b0e8c81e8d0.tar.xz
linux-dev-550ade8432a2a6fbfb48ba7018750b0e8c81e8d0.zip
[IPSEC]: Use dst->header_len when resizing on output
Currently we use x->props.header_len when resizing on output. However, if we're resizing at all we might as well go the whole hog and do it for the whole dst. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index f4bfd6c45651..58d5a746b1c3 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -19,7 +19,8 @@
static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
{
- int nhead = x->props.header_len + LL_RESERVED_SPACE(skb->dst->dev)
+ struct dst_entry *dst = skb->dst;
+ int nhead = dst->header_len + LL_RESERVED_SPACE(dst->dev)
- skb_headroom(skb);
if (nhead > 0)