OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90284c2
)
esp4: remove assignment in if condition
author
Fabian Frederick
<fabf@skynet.be>
Tue, 4 Nov 2014 21:54:36 +0000
(22:54 +0100)
committer
David S. Miller
<davem@davemloft.net>
Tue, 4 Nov 2014 21:57:49 +0000
(16:57 -0500)
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/esp4.c
patch
|
blob
|
history
diff --git
a/net/ipv4/esp4.c
b/net/ipv4/esp4.c
index
360b565
..
d2bf02e
100644
(file)
--- 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);