Netdev List
 help / color / mirror / Atom feed
From: Herbert Xu <herbert@gondor.apana.org.au>
To: "David S. Miller" <davem@davemloft.net>,
	YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>,
	netdev@vger.kernel.org
Subject: [PATCH 2/11] [IPSEC]: Use dst->header_len when resizing on output
Date: Wed, 24 Oct 2007 00:03:27 +0800	[thread overview]
Message-ID: <E1IkME3-0008O2-00@gondolin.me.apana.org.au> (raw)
In-Reply-To: 20071023160217.GA32102@gondor.apana.org.au

[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>
---

 net/xfrm/xfrm_output.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index f4bfd6c..58d5a74 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)

  parent reply	other threads:[~2007-10-23 16:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-23 16:02 [0/11] Merge bundle creation and other misc fixes/clean-ups Herbert Xu
2007-10-23 16:03 ` [PATCH 1/11] [IPV6]: Only set nfheader_len for top xfrm dst Herbert Xu
2007-10-23 16:03 ` Herbert Xu [this message]
2007-10-23 16:03 ` [PATCH 3/11] [IPV6]: Move nfheader_len into rt6_info Herbert Xu
2007-10-23 16:03 ` [PATCH 4/11] [NET]: Eliminate duplicate copies of dst_discard Herbert Xu
2007-10-23 16:03 ` [PATCH 5/11] [NET]: Remove unnecessary inclusion of dst.h Herbert Xu
2007-10-23 16:03 ` [PATCH 6/11] [IPSEC]: Only set neighbour on top xfrm dst Herbert Xu
2007-10-23 16:03 ` [PATCH 7/11] [IPSEC]: Set dst->input to dst_discard Herbert Xu
2007-10-23 16:03 ` [PATCH 8/11] [IPSEC]: Make sure idev is consistent with dev in xfrm_dst Herbert Xu
2007-10-23 16:03 ` [PATCH 9/11] [IPSEC]: Replace x->type->{local,remote}_addr with flags Herbert Xu
2007-10-23 16:03 ` [PATCH 10/11] [IPSEC]: Move flow construction into xfrm_dst_lookup Herbert Xu
2007-10-23 16:03 ` [PATCH 11/11] [IPSEC]: Merge common code into xfrm_bundle_create Herbert Xu
2007-10-30  5:06 ` [0/11] Merge bundle creation and other misc fixes/clean-ups David Miller
2007-10-30  5:49   ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1IkME3-0008O2-00@gondolin.me.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=yoshfuji@linux-ipv6.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox