diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-12 04:14:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 23:53:47 +0100 |
| commit | c439cb2e4b13cf1cb2abcd006b906315a3381323 (patch) | |
| tree | 7bb9d27214e010d37d6a715d0533a7148a8f429a /net/ipv4/xfrm4_output.c | |
| parent | [IPSEC]: Separate inner/outer mode processing on input (diff) | |
| download | linux-c439cb2e4b13cf1cb2abcd006b906315a3381323.tar.xz linux-c439cb2e4b13cf1cb2abcd006b906315a3381323.zip | |
[IPV4]: Add ip_local_out
Most callers of the LOCAL_OUT chain will set the IP packet length and
header checksum before doing so. They also share the same output
function dst_output.
This patch creates a new function called ip_local_out which does all
of that and converts the appropriate users over to it.
Apart from removing duplicate code, it will also help in merging the
IPsec output path once the same thing is done for IPv6.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
| -rw-r--r-- | net/ipv4/xfrm4_output.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index 13fd11335e28..0ffc3d078489 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -69,17 +69,12 @@ EXPORT_SYMBOL(xfrm4_prepare_output); static inline int xfrm4_output_one(struct sk_buff *skb) { - struct iphdr *iph; int err; err = xfrm_output(skb); if (err) goto error_nolock; - iph = ip_hdr(skb); - iph->tot_len = htons(skb->len); - ip_send_check(iph); - IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED; err = 0; @@ -97,8 +92,7 @@ static int xfrm4_output_finish2(struct sk_buff *skb) while (likely((err = xfrm4_output_one(skb)) == 0)) { nf_reset(skb); - err = nf_hook(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, - skb->dst->dev, dst_output); + err = __ip_local_out(skb); if (unlikely(err != 1)) break; |