From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Subject: [PATCH -next 2/3] net: fib6: reduce identation in ip6_convert_metrics
Date: Fri, 28 Aug 2015 14:11:08 +0200 [thread overview]
Message-ID: <1440763869-23067-3-git-send-email-fw@strlen.de> (raw)
In-Reply-To: <1440763869-23067-1-git-send-email-fw@strlen.de>
From: Daniel Borkmann <daniel@iogearbox.net>
Reduce the identation a bit, there's no need to artificically have
it increased.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
net/ipv6/route.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index df3e353..56b2e71 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1711,26 +1711,26 @@ static int ip6_convert_metrics(struct mx6_config *mxc,
nla_for_each_attr(nla, cfg->fc_mx, cfg->fc_mx_len, remaining) {
int type = nla_type(nla);
+ u32 val;
- if (type) {
- u32 val;
-
- if (unlikely(type > RTAX_MAX))
- goto err;
- if (type == RTAX_CC_ALGO) {
- char tmp[TCP_CA_NAME_MAX];
+ if (!type)
+ continue;
+ if (unlikely(type > RTAX_MAX))
+ goto err;
- nla_strlcpy(tmp, nla, sizeof(tmp));
- val = tcp_ca_get_key_by_name(tmp);
- if (val == TCP_CA_UNSPEC)
- goto err;
- } else {
- val = nla_get_u32(nla);
- }
+ if (type == RTAX_CC_ALGO) {
+ char tmp[TCP_CA_NAME_MAX];
- mp[type - 1] = val;
- __set_bit(type - 1, mxc->mx_valid);
+ nla_strlcpy(tmp, nla, sizeof(tmp));
+ val = tcp_ca_get_key_by_name(tmp);
+ if (val == TCP_CA_UNSPEC)
+ goto err;
+ } else {
+ val = nla_get_u32(nla);
}
+
+ mp[type - 1] = val;
+ __set_bit(type - 1, mxc->mx_valid);
}
mxc->mx = mp;
--
2.0.5
next prev parent reply other threads:[~2015-08-28 12:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 12:11 [PATCH -next 0/3] tcp: receive-side per route dctcp handling Florian Westphal
2015-08-28 12:11 ` [PATCH -next 1/3] net: fib: move metrics parsing to a helper Florian Westphal
2015-08-28 12:11 ` Florian Westphal [this message]
2015-08-28 12:11 ` [PATCH -next 3/3] tcp: use dctcp if enabled on the route to the initiator Florian Westphal
2015-08-28 21:18 ` David Miller
2015-08-29 20:51 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440763869-23067-3-git-send-email-fw@strlen.de \
--to=fw@strlen.de \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).