From ad82e1a2188886eeac7fa237036f31e42e490e60 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 13 Nov 2007 21:33:01 -0800 Subject: [PATCH] --- yaml --- r: 78088 b: refs/heads/master c: 550ade8432a2a6fbfb48ba7018750b0e8c81e8d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_output.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4713714231a8..529fe0c6e199 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0148894223740da4818d7f4e6f92cbb5481a25b8 +refs/heads/master: 550ade8432a2a6fbfb48ba7018750b0e8c81e8d0 diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c index f4bfd6c45651..58d5a746b1c3 100644 --- a/trunk/net/xfrm/xfrm_output.c +++ b/trunk/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)