projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-drm-fsl-dcu.git]
/
net
/
ipv6
/
xfrm6_output.c
diff --git
a/net/ipv6/xfrm6_output.c
b/net/ipv6/xfrm6_output.c
index c8c8b44a0f581ee2e486ab5469ed8f9e4ba0bc81..d6d786b89d2bb5e9ec529fec0ac1888f5ea83e31 100644
(file)
--- a/
net/ipv6/xfrm6_output.c
+++ b/
net/ipv6/xfrm6_output.c
@@
-2,7
+2,7
@@
* xfrm6_output.c - Common IPsec encapsulation code for IPv6.
* Copyright (C) 2002 USAGI/WIDE Project
* Copyright (c) 2004 Herbert Xu <herbert@gondor.apana.org.au>
* xfrm6_output.c - Common IPsec encapsulation code for IPv6.
* Copyright (C) 2002 USAGI/WIDE Project
* Copyright (c) 2004 Herbert Xu <herbert@gondor.apana.org.au>
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
@@
-17,6
+17,12
@@
#include <net/ipv6.h>
#include <net/xfrm.h>
#include <net/ipv6.h>
#include <net/xfrm.h>
+int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
+ u8 **prevhdr)
+{
+ return ip6_find_1stfragopt(skb, prevhdr);
+}
+
static int xfrm6_tunnel_check_size(struct sk_buff *skb)
{
int mtu, ret = 0;
static int xfrm6_tunnel_check_size(struct sk_buff *skb)
{
int mtu, ret = 0;
@@
-40,14
+46,14
@@
static int xfrm6_output_one(struct sk_buff *skb)
struct dst_entry *dst = skb->dst;
struct xfrm_state *x = dst->xfrm;
int err;
struct dst_entry *dst = skb->dst;
struct xfrm_state *x = dst->xfrm;
int err;
-
- if (skb->ip_summed == CHECKSUM_
HW
) {
- err = skb_checksum_help(skb
, 0
);
+
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
+ err = skb_checksum_help(skb);
if (err)
goto error_nolock;
}
if (err)
goto error_nolock;
}
- if (x->props.mode) {
+ if (x->props.mode
== XFRM_MODE_TUNNEL
) {
err = xfrm6_tunnel_check_size(skb);
if (err)
goto error_nolock;
err = xfrm6_tunnel_check_size(skb);
if (err)
goto error_nolock;
@@
-59,7
+65,7
@@
static int xfrm6_output_one(struct sk_buff *skb)
if (err)
goto error;
if (err)
goto error;
- err = x->mode->output(skb);
+ err = x->mode->output(
x,
skb);
if (err)
goto error;
if (err)
goto error;
@@
-69,18
+75,20
@@
static int xfrm6_output_one(struct sk_buff *skb)
x->curlft.bytes += skb->len;
x->curlft.packets++;
x->curlft.bytes += skb->len;
x->curlft.packets++;
+ if (x->props.mode == XFRM_MODE_ROUTEOPTIMIZATION)
+ x->lastused = (u64)xtime.tv_sec;
spin_unlock_bh(&x->lock);
skb->nh.raw = skb->data;
spin_unlock_bh(&x->lock);
skb->nh.raw = skb->data;
-
+
if (!(skb->dst = dst_pop(dst))) {
err = -EHOSTUNREACH;
goto error_nolock;
}
dst = skb->dst;
x = dst->xfrm;
if (!(skb->dst = dst_pop(dst))) {
err = -EHOSTUNREACH;
goto error_nolock;
}
dst = skb->dst;
x = dst->xfrm;
- } while (x &&
!x->props.mode
);
+ } while (x &&
(x->props.mode != XFRM_MODE_TUNNEL)
);
IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
err = 0;
IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
err = 0;
@@
-100,7
+108,7
@@
static int xfrm6_output_finish2(struct sk_buff *skb)
while (likely((err = xfrm6_output_one(skb)) == 0)) {
nf_reset(skb);
while (likely((err = xfrm6_output_one(skb)) == 0)) {
nf_reset(skb);
-
+
err = nf_hook(PF_INET6, NF_IP6_LOCAL_OUT, &skb, NULL,
skb->dst->dev, dst_output);
if (unlikely(err != 1))
err = nf_hook(PF_INET6, NF_IP6_LOCAL_OUT, &skb, NULL,
skb->dst->dev, dst_output);
if (unlikely(err != 1))