git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
net
/
xfrm
/
xfrm_input.c
diff --git
a/net/xfrm/xfrm_input.c
b/net/xfrm/xfrm_input.c
index 039e7019c48a4e56b40354177e553752568f6793..62188c6a06ddc2d933f0ad88819f3d4f10479638 100644
(file)
--- a/
net/xfrm/xfrm_input.c
+++ b/
net/xfrm/xfrm_input.c
@@
-81,7
+81,6
@@
int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
*seq = *(__be32*)(skb_transport_header(skb) + offset_seq);
return 0;
}
*seq = *(__be32*)(skb_transport_header(skb) + offset_seq);
return 0;
}
-EXPORT_SYMBOL(xfrm_parse_spi);
int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb)
{
int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb)
{
@@
-110,7
+109,7
@@
int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
if (encap_type < 0) {
async = 1;
x = xfrm_input_state(skb);
if (encap_type < 0) {
async = 1;
x = xfrm_input_state(skb);
- seq = XFRM_SKB_CB(skb)->seq;
+ seq = XFRM_SKB_CB(skb)->seq
.input
;
goto resume;
}
goto resume;
}
@@
-160,12
+159,12
@@
int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
}
if ((x->encap ? x->encap->encap_type : 0) != encap_type) {
}
if ((x->encap ? x->encap->encap_type : 0) != encap_type) {
- XFRM_INC_STATS(LINUX_MIB_XFRMINSTATE
INVALID
);
+ XFRM_INC_STATS(LINUX_MIB_XFRMINSTATE
MISMATCH
);
goto drop_unlock;
}
if (x->props.replay_window && xfrm_replay_check(x, skb, seq)) {
goto drop_unlock;
}
if (x->props.replay_window && xfrm_replay_check(x, skb, seq)) {
- XFRM_INC_STATS(LINUX_MIB_XFRMINS
EQOUTOFWINDOW
);
+ XFRM_INC_STATS(LINUX_MIB_XFRMINS
TATESEQERROR
);
goto drop_unlock;
}
goto drop_unlock;
}
@@
-176,7
+175,7
@@
int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
spin_unlock(&x->lock);
spin_unlock(&x->lock);
- XFRM_SKB_CB(skb)->seq = seq;
+ XFRM_SKB_CB(skb)->seq
.input
= seq;
nexthdr = x->type->input(x, skb);
nexthdr = x->type->input(x, skb);