summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_flowlabel.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2014-11-24 00:28:43 +0300
committerDavid S. Miller <davem@davemloft.net>2014-11-24 05:00:56 +0300
commite5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch)
tree6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/ip6_flowlabel.c
parent78e2045d3d562e43562e3cbf0e96c26e38a718e9 (diff)
downloadlinux-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.tar.xz
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/ip6_flowlabel.c')
-rw-r--r--net/ipv6/ip6_flowlabel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 7221021b2d97..2f780cba6e12 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -654,7 +654,11 @@ release:
goto done;
err = -ENOMEM;
- if (sfl1 == NULL || (err = mem_check(sk)) != 0)
+ if (sfl1 == NULL)
+ goto done;
+
+ err = mem_check(sk);
+ if (err != 0)
goto done;
fl1 = fl_intern(net, fl, freq.flr_label);