|
@@ -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;
|