diff options
Diffstat (limited to 'net/ipv6/xfrm6_output.c')
-rw-r--r-- | net/ipv6/xfrm6_output.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index c260ea104c52..d6d786b89d2b 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * xfrm6_output.c - Common IPsec encapsulation code for IPv6. | 2 | * xfrm6_output.c - Common IPsec encapsulation code for IPv6. |
3 | * Copyright (C) 2002 USAGI/WIDE Project | 3 | * Copyright (C) 2002 USAGI/WIDE Project |
4 | * Copyright (c) 2004 Herbert Xu <herbert@gondor.apana.org.au> | 4 | * Copyright (c) 2004 Herbert Xu <herbert@gondor.apana.org.au> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
@@ -46,7 +46,7 @@ static int xfrm6_output_one(struct sk_buff *skb) | |||
46 | struct dst_entry *dst = skb->dst; | 46 | struct dst_entry *dst = skb->dst; |
47 | struct xfrm_state *x = dst->xfrm; | 47 | struct xfrm_state *x = dst->xfrm; |
48 | int err; | 48 | int err; |
49 | 49 | ||
50 | if (skb->ip_summed == CHECKSUM_PARTIAL) { | 50 | if (skb->ip_summed == CHECKSUM_PARTIAL) { |
51 | err = skb_checksum_help(skb); | 51 | err = skb_checksum_help(skb); |
52 | if (err) | 52 | if (err) |
@@ -81,7 +81,7 @@ static int xfrm6_output_one(struct sk_buff *skb) | |||
81 | spin_unlock_bh(&x->lock); | 81 | spin_unlock_bh(&x->lock); |
82 | 82 | ||
83 | skb->nh.raw = skb->data; | 83 | skb->nh.raw = skb->data; |
84 | 84 | ||
85 | if (!(skb->dst = dst_pop(dst))) { | 85 | if (!(skb->dst = dst_pop(dst))) { |
86 | err = -EHOSTUNREACH; | 86 | err = -EHOSTUNREACH; |
87 | goto error_nolock; | 87 | goto error_nolock; |
@@ -108,7 +108,7 @@ static int xfrm6_output_finish2(struct sk_buff *skb) | |||
108 | 108 | ||
109 | while (likely((err = xfrm6_output_one(skb)) == 0)) { | 109 | while (likely((err = xfrm6_output_one(skb)) == 0)) { |
110 | nf_reset(skb); | 110 | nf_reset(skb); |
111 | 111 | ||
112 | err = nf_hook(PF_INET6, NF_IP6_LOCAL_OUT, &skb, NULL, | 112 | err = nf_hook(PF_INET6, NF_IP6_LOCAL_OUT, &skb, NULL, |
113 | skb->dst->dev, dst_output); | 113 | skb->dst->dev, dst_output); |
114 | if (unlikely(err != 1)) | 114 | if (unlikely(err != 1)) |