aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_semantics.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2017-11-14 11:25:49 -0500
committerDavid S. Miller <davem@davemloft.net>2017-11-15 00:09:52 -0500
commit6670e152447732ba90626f36dfc015a13fbf150e (patch)
tree0848d15b1d27139ee651c8ecae0136bb679f205a /net/ipv4/fib_semantics.c
parent11bf284f81b46f59d5f4a4522c13aa7852cfd560 (diff)
tcp: Namespace-ify sysctl_tcp_default_congestion_control
Make default TCP default congestion control to a per namespace value. This changes default congestion control to a pointer to congestion ops (rather than implicit as first element of available lsit). The congestion control setting of new namespaces is inherited from the current setting of the root namespace. Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_semantics.c')
-rw-r--r--net/ipv4/fib_semantics.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 589caaa90613..f04d944f8abe 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -710,7 +710,7 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)
710 bool ecn_ca = false; 710 bool ecn_ca = false;
711 711
712 nla_strlcpy(tmp, nla, sizeof(tmp)); 712 nla_strlcpy(tmp, nla, sizeof(tmp));
713 val = tcp_ca_get_key_by_name(tmp, &ecn_ca); 713 val = tcp_ca_get_key_by_name(fi->fib_net, tmp, &ecn_ca);
714 } else { 714 } else {
715 val = nla_get_u32(nla); 715 val = nla_get_u32(nla);
716 } 716 }
@@ -1030,7 +1030,7 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)
1030 char tmp[TCP_CA_NAME_MAX]; 1030 char tmp[TCP_CA_NAME_MAX];
1031 1031
1032 nla_strlcpy(tmp, nla, sizeof(tmp)); 1032 nla_strlcpy(tmp, nla, sizeof(tmp));
1033 val = tcp_ca_get_key_by_name(tmp, &ecn_ca); 1033 val = tcp_ca_get_key_by_name(fi->fib_net, tmp, &ecn_ca);
1034 if (val == TCP_CA_UNSPEC) 1034 if (val == TCP_CA_UNSPEC)
1035 return -EINVAL; 1035 return -EINVAL;
1036 } else { 1036 } else {