aboutsummaryrefslogtreecommitdiff
path: root/net/xfrm
diff options
context:
space:
mode:
authorUlrich Weber <ulrich.weber@sophos.com>2012-11-08 11:15:44 +0100
committerSteffen Klassert <steffen.klassert@secunet.com>2012-11-08 12:42:49 +0100
commitaafd0d88ee3a009b3f4f576a8e6e114d4810e489 (patch)
tree8880f427cc57d4f32d37fa24c5fb317d74f18f7c /net/xfrm
parentf1e0b5b4f1eae56a3192688177f36e2bdf0e01ac (diff)
downloadvexpress-lsk-aafd0d88ee3a009b3f4f576a8e6e114d4810e489.tar.gz
xfrm: remove redundant replay_esn check
x->replay_esn is already checked in if clause, so remove check and ident properly Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_replay.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index 3efb07d3eb2..765f6fe951e 100644
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -521,13 +521,12 @@ int xfrm_init_replay(struct xfrm_state *x)
replay_esn->bmp_len * sizeof(__u32) * 8)
return -EINVAL;
- if ((x->props.flags & XFRM_STATE_ESN) && replay_esn->replay_window == 0)
- return -EINVAL;
-
- if ((x->props.flags & XFRM_STATE_ESN) && x->replay_esn)
- x->repl = &xfrm_replay_esn;
- else
- x->repl = &xfrm_replay_bmp;
+ if (x->props.flags & XFRM_STATE_ESN) {
+ if (replay_esn->replay_window == 0)
+ return -EINVAL;
+ x->repl = &xfrm_replay_esn;
+ } else
+ x->repl = &xfrm_replay_bmp;
} else
x->repl = &xfrm_replay_legacy;