git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
ipv6
/
xfrm6_input.c
diff --git
a/net/ipv6/xfrm6_input.c
b/net/ipv6/xfrm6_input.c
index
00cfdee
..
1ca2da6
100644
(file)
--- a/
net/ipv6/xfrm6_input.c
+++ b/
net/ipv6/xfrm6_input.c
@@
-28,11
+28,12
@@
static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
IP6_ECN_set_ce(inner_iph);
}
IP6_ECN_set_ce(inner_iph);
}
-int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
+int xfrm6_rcv_spi(struct sk_buff *
*p
skb, u32 spi)
{
{
+ struct sk_buff *skb = *pskb;
int err;
u32 seq;
int err;
u32 seq;
- struct
xfrm_state *
xfrm_vec[XFRM_MAX_DEPTH];
+ struct
sec_decap_state
xfrm_vec[XFRM_MAX_DEPTH];
struct xfrm_state *x;
int xfrm_nr = 0;
int decaps = 0;
struct xfrm_state *x;
int xfrm_nr = 0;
int decaps = 0;
@@
-65,7
+66,7
@@
int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
if (xfrm_state_check_expire(x))
goto drop_unlock;
if (xfrm_state_check_expire(x))
goto drop_unlock;
- nexthdr = x->type->input(x, skb);
+ nexthdr = x->type->input(x,
&(xfrm_vec[xfrm_nr].decap),
skb);
if (nexthdr <= 0)
goto drop_unlock;
if (nexthdr <= 0)
goto drop_unlock;
@@
-79,7
+80,7
@@
int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
spin_unlock(&x->lock);
spin_unlock(&x->lock);
- xfrm_vec[xfrm_nr++] = x;
+ xfrm_vec[xfrm_nr++]
.xvec
= x;
if (x->props.mode) { /* XXX */
if (nexthdr != IPPROTO_IPV6)
if (x->props.mode) { /* XXX */
if (nexthdr != IPPROTO_IPV6)
@@
-118,8
+119,7
@@
int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)
goto drop;
if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)
goto drop;
- memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,
- xfrm_nr * sizeof(xfrm_vec[0]));
+ memcpy(skb->sp->x+skb->sp->len, xfrm_vec, xfrm_nr*sizeof(struct sec_decap_state));
skb->sp->len += xfrm_nr;
skb->ip_summed = CHECKSUM_NONE;
skb->sp->len += xfrm_nr;
skb->ip_summed = CHECKSUM_NONE;
@@
-150,7
+150,7
@@
drop_unlock:
xfrm_state_put(x);
drop:
while (--xfrm_nr >= 0)
xfrm_state_put(x);
drop:
while (--xfrm_nr >= 0)
- xfrm_state_put(xfrm_vec[xfrm_nr]);
+ xfrm_state_put(xfrm_vec[xfrm_nr]
.xvec
);
kfree_skb(skb);
return -1;
}
kfree_skb(skb);
return -1;
}
@@
-159,5
+159,5
@@
EXPORT_SYMBOL(xfrm6_rcv_spi);
int xfrm6_rcv(struct sk_buff **pskb)
{
int xfrm6_rcv(struct sk_buff **pskb)
{
- return xfrm6_rcv_spi(
*
pskb, 0);
+ return xfrm6_rcv_spi(pskb, 0);
}
}