diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
| commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
| tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /net/xfrm/xfrm_input.c | |
| parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
| parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) | |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/xfrm/xfrm_input.c')
| -rw-r--r-- | net/xfrm/xfrm_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index b89c9c7f8c5c..be3520e429c9 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c | |||
| @@ -458,6 +458,7 @@ resume: | |||
| 458 | XFRM_INC_STATS(net, LINUX_MIB_XFRMINHDRERROR); | 458 | XFRM_INC_STATS(net, LINUX_MIB_XFRMINHDRERROR); |
| 459 | goto drop; | 459 | goto drop; |
| 460 | } | 460 | } |
| 461 | crypto_done = false; | ||
| 461 | } while (!err); | 462 | } while (!err); |
| 462 | 463 | ||
| 463 | err = xfrm_rcv_cb(skb, family, x->type->proto, 0); | 464 | err = xfrm_rcv_cb(skb, family, x->type->proto, 0); |