2014-11-04 21:54:51

by Fabian Frédérick

Subject: [PATCH V2 net-next] esp4: remove assignment in if condition

Signed-off-by: Fabian Frederick <[email protected]>
---
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);
--
1.9.3

2014-11-04 21:58:43

by David Miller

Subject: Re: [PATCH V2 net-next] esp4: remove assignment in if condition

From: Fabian Frederick <[email protected]>
Date: Tue, 4 Nov 2014 22:54:36 +0100

> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> V2: remove blank line between set and test (suggested by Joe Perches).

Applied, thanks.