diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-15 00:14:01 (GMT) |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-15 00:14:01 (GMT) |
commit | 07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 (patch) | |
tree | 0cdb5735800ddd63d8850aa26d3a3f1f3334267a /net/xfrm/xfrm_input.c | |
parent | 07a062140372187642003e02a49edc8a2115c1ca (diff) | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
download | linux-fsl-qoriq-07aaae44f5a3962c3a410a6dd7936dfa7dece2b9.tar.xz |
Merge commit 'v3.1-rc9' into fbdev-next
Diffstat (limited to 'net/xfrm/xfrm_input.c')
-rw-r--r-- | net/xfrm/xfrm_input.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index a026b0e..54a0dc2 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -212,6 +212,11 @@ resume: /* only the first xfrm gets the encap type */ encap_type = 0; + if (async && x->repl->check(x, skb, seq)) { + XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATESEQERROR); + goto drop_unlock; + } + x->repl->advance(x, seq); x->curlft.bytes += skb->len; |