aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ah6.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2014-11-23 16:28:43 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-23 21:00:56 -0500
commite5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch)
tree6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/ah6.c
parent78e2045d3d562e43562e3cbf0e96c26e38a718e9 (diff)
ipv6: coding style improvements (remove assignment in if statements)
This change has no functional impact and simply addresses some coding style issues detected by checkpatch. Specifically this change adjusts "if" statements which also include the assignment of a variable. No changes to the resultant object files result as determined by objdiff. Signed-off-by: Ian Morris <ipm@chirality.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ah6.c')
-rw-r--r--net/ipv6/ah6.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 8ab1989198f6..a6727add2624 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -353,7 +353,8 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
353 ahp = x->data; 353 ahp = x->data;
354 ahash = ahp->ahash; 354 ahash = ahp->ahash;
355 355
356 if ((err = skb_cow_data(skb, 0, &trailer)) < 0) 356 err = skb_cow_data(skb, 0, &trailer);
357 if (err < 0)
357 goto out; 358 goto out;
358 nfrags = err; 359 nfrags = err;
359 360
@@ -559,8 +560,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
559 if (!pskb_may_pull(skb, ah_hlen)) 560 if (!pskb_may_pull(skb, ah_hlen))
560 goto out; 561 goto out;
561 562
562 563 err = skb_cow_data(skb, 0, &trailer);
563 if ((err = skb_cow_data(skb, 0, &trailer)) < 0) 564 if (err < 0)
564 goto out; 565 goto out;
565 nfrags = err; 566 nfrags = err;
566 567