diff options
author | Nikolay Borisov <kernel@kyup.com> | 2016-02-03 02:46:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-07 14:35:10 -0500 |
commit | 1043e25ff96a1efc7bd34d11f5f32203a28a3bd7 (patch) | |
tree | 56eb979f398384e49864dfcfb40d0c48e7a7f622 /net/ipv4/tcp_metrics.c | |
parent | 12ed8244ed8b31b023ea6d2851fd8b15f2999e9b (diff) |
ipv4: Namespaceify tcp reordering sysctl knob
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
-rw-r--r-- | net/ipv4/tcp_metrics.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index c8cbc2b4b792..c26241f3057b 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c | |||
@@ -369,6 +369,7 @@ void tcp_update_metrics(struct sock *sk) | |||
369 | const struct inet_connection_sock *icsk = inet_csk(sk); | 369 | const struct inet_connection_sock *icsk = inet_csk(sk); |
370 | struct dst_entry *dst = __sk_dst_get(sk); | 370 | struct dst_entry *dst = __sk_dst_get(sk); |
371 | struct tcp_sock *tp = tcp_sk(sk); | 371 | struct tcp_sock *tp = tcp_sk(sk); |
372 | struct net *net = sock_net(sk); | ||
372 | struct tcp_metrics_block *tm; | 373 | struct tcp_metrics_block *tm; |
373 | unsigned long rtt; | 374 | unsigned long rtt; |
374 | u32 val; | 375 | u32 val; |
@@ -473,7 +474,7 @@ void tcp_update_metrics(struct sock *sk) | |||
473 | if (!tcp_metric_locked(tm, TCP_METRIC_REORDERING)) { | 474 | if (!tcp_metric_locked(tm, TCP_METRIC_REORDERING)) { |
474 | val = tcp_metric_get(tm, TCP_METRIC_REORDERING); | 475 | val = tcp_metric_get(tm, TCP_METRIC_REORDERING); |
475 | if (val < tp->reordering && | 476 | if (val < tp->reordering && |
476 | tp->reordering != sysctl_tcp_reordering) | 477 | tp->reordering != net->ipv4.sysctl_tcp_reordering) |
477 | tcp_metric_set(tm, TCP_METRIC_REORDERING, | 478 | tcp_metric_set(tm, TCP_METRIC_REORDERING, |
478 | tp->reordering); | 479 | tp->reordering); |
479 | } | 480 | } |