From patchwork Thu Nov 8 10:15:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weber X-Patchwork-Id: 197821 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1FCC92C00BF for ; Thu, 8 Nov 2012 21:24:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571Ab2KHKYl (ORCPT ); Thu, 8 Nov 2012 05:24:41 -0500 Received: from mx1.sophos.com ([145.253.124.137]:60216 "EHLO mx1.sophos.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126Ab2KHKYk (ORCPT ); Thu, 8 Nov 2012 05:24:40 -0500 X-Greylist: delayed 530 seconds by postgrey-1.27 at vger.kernel.org; Thu, 08 Nov 2012 05:24:40 EST Received: from mx1.sophos.com (localhost.localdomain [127.0.0.1]) by localhost (Postfix) with SMTP id 880C45B8082; Thu, 8 Nov 2012 10:15:49 +0000 (GMT) Received: from de-wie-exch3b.green.sophos (de-wie-exch3b.green.sophos [10.60.70.62]) by mx1.sophos.com (Postfix) with ESMTPS id 4D43A5B8079; Thu, 8 Nov 2012 10:15:49 +0000 (GMT) Received: from uweber-WS (10.128.129.40) by de-wie-exch3b.green.sophos (10.60.70.65) with Microsoft SMTP Server (TLS) id 14.2.247.3; Thu, 8 Nov 2012 11:15:49 +0100 Date: Thu, 8 Nov 2012 11:15:44 +0100 From: Ulrich Weber To: CC: Subject: [PATCH] xfrm: remove redundant replay_esn check Message-ID: <20121108101544.GA30309@uweber-WS> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [10.128.129.40] DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sophos.com; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=global; bh=JmLEoe91SxO+QFNpJdwq5lKhHyNyrL5WKuekjJOm8YU=; b=nQzR8MoabZZMF1m2JYpkCJ0oMQJOiXEptU/CPV/r0eXppVBw1LqyRmyfwnAd7xiLeQeM0uCMq0IQjNtujklupvs9+jl0gWwgtW4i+3ruBSo6uNLobTyr0hqIZ/RsYGTQVzvsBSqwOeIy3WnwvT2SPLXVjoQQJhN/sLop5+Oj2EY= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org x->replay_esn is already checked in if clause, so remove check and ident properly Signed-off-by: Ulrich Weber --- net/xfrm/xfrm_replay.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c index 3efb07d..765f6fe 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;