From patchwork Tue Nov 4 21:54:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 406805 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 3423A14009E for ; Wed, 5 Nov 2014 08:55:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751682AbaKDVyu (ORCPT ); Tue, 4 Nov 2014 16:54:50 -0500 Received: from mailrelay005.isp.belgacom.be ([195.238.6.171]:62443 "EHLO mailrelay005.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751084AbaKDVyt (ORCPT ); Tue, 4 Nov 2014 16:54:49 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ar8SABRKWVRbsl9p/2dsb2JhbABagw6BLbsKBQF0misEAoEkFwEBAQEBfYRfI4EaN4hFAbwNjy+GN4l1ZB2ENQWeDpZSgUcBgjE8L4EGgUUBAQE Received: from 105.95-178-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.178.95.105]) by relay.skynet.be with ESMTP; 04 Nov 2014 22:54:43 +0100 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Joe Perches , Fabian Frederick , Steffen Klassert , Herbert Xu , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org Subject: [PATCH V2 net-next] esp4: remove assignment in if condition Date: Tue, 4 Nov 2014 22:54:36 +0100 Message-Id: <1415138076-7036-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Fabian Frederick --- V2: remove blank line between set and test (suggested by Joe Perches). net/ipv4/esp4.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 360b565..d2bf02e 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -392,8 +392,10 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) if (elen <= 0) goto out; - if ((err = skb_cow_data(skb, 0, &trailer)) < 0) + err = skb_cow_data(skb, 0, &trailer); + if (err < 0) goto out; + nfrags = err; assoclen = sizeof(*esph);