diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-13 15:52:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-13 15:52:14 -0500 |
commit | 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be (patch) | |
tree | 37000c5d7e663e4ae9800a7bcde9934984b8bae9 /net/ipv6/tcp_ipv6.c | |
parent | cc6f02dd490dac4ad821d5077b934c9b37037cd0 (diff) |
net: Abstract default ADVMSS behind an accessor.
Make all RTAX_ADVMSS metric accesses go through a new helper function,
dst_metric_advmss().
Leave the actual default metric as "zero" in the real metric slot,
and compute the actual default value dynamically via a new dst_ops
AF specific callback.
For stacked IPSEC routes, we use the advmss of the path which
preserves existing behavior.
Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates
advmss on pmtu updates. This inconsistency in advmss handling
results in more raw metric accesses than I wish we ended up with.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index fee076891646..20aa95e37359 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1521,7 +1521,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
1521 | 1521 | ||
1522 | tcp_mtup_init(newsk); | 1522 | tcp_mtup_init(newsk); |
1523 | tcp_sync_mss(newsk, dst_mtu(dst)); | 1523 | tcp_sync_mss(newsk, dst_mtu(dst)); |
1524 | newtp->advmss = dst_metric(dst, RTAX_ADVMSS); | 1524 | newtp->advmss = dst_metric_advmss(dst); |
1525 | tcp_initialize_rcv_mss(newsk); | 1525 | tcp_initialize_rcv_mss(newsk); |
1526 | 1526 | ||
1527 | newinet->inet_daddr = newinet->inet_saddr = LOOPBACK4_IPV6; | 1527 | newinet->inet_daddr = newinet->inet_saddr = LOOPBACK4_IPV6; |