diff options
author | Simon Arlott <simon@fire.lp0.eu> | 2007-07-26 03:09:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-31 05:28:04 -0400 |
commit | 566cfd8f0e049a0647f94714f913e2a975dc464f (patch) | |
tree | 955049995c9cc06dc2db3b11a73454c09cf8eb18 | |
parent | 342ff7b24f42d01b27d884c699855c713d720fcb (diff) |
[IPV6]: Don't update ADVMSS on routes where the MTU is not also updated
The ADVMSS value was incorrectly updated for ALL routes when the MTU
is updated because it's outside the effect of the if statement's
condition.
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/route.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 919de682b331..55ea80fac601 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -1983,9 +1983,10 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg) | |||
1983 | !dst_metric_locked(&rt->u.dst, RTAX_MTU) && | 1983 | !dst_metric_locked(&rt->u.dst, RTAX_MTU) && |
1984 | (dst_mtu(&rt->u.dst) > arg->mtu || | 1984 | (dst_mtu(&rt->u.dst) > arg->mtu || |
1985 | (dst_mtu(&rt->u.dst) < arg->mtu && | 1985 | (dst_mtu(&rt->u.dst) < arg->mtu && |
1986 | dst_mtu(&rt->u.dst) == idev->cnf.mtu6))) | 1986 | dst_mtu(&rt->u.dst) == idev->cnf.mtu6))) { |
1987 | rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu; | 1987 | rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu; |
1988 | rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(arg->mtu); | 1988 | rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(arg->mtu); |
1989 | } | ||
1989 | return 0; | 1990 | return 0; |
1990 | } | 1991 | } |
1991 | 1992 | ||