From: Fabian Frederick <fabf@skynet.be>
Date: Tue, 4 Nov 2014 21:54:36 +0000 (+0100)
Subject: esp4: remove assignment in if condition
X-Git-Tag: firefly_0821_release~176^2~2717^2~279
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=05006e8c59050b2bab1bfe9cac631505d21122a3;p=firefly-linux-kernel-4.4.55.git

esp4: remove assignment in if condition

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 360b565918c4..d2bf02e0a678 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);