]> err.no Git - linux-2.6/commitdiff
[IPV6]: Update MSS even if MTU is unchanged.
authorJim Paris <jim@jtan.com>
Fri, 1 Feb 2008 00:36:25 +0000 (16:36 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2008 03:28:21 +0000 (19:28 -0800)
This is needed because in ndisc.c, we have:

  static void ndisc_router_discovery(struct sk_buff *skb)
  {
  // ...
   if (ndopts.nd_opts_mtu) {
  // ...
   if (rt)
   rt->u.dst.metrics[RTAX_MTU-1] = mtu;

   rt6_mtu_change(skb->dev, mtu);
  // ...
  }

Since the mtu is set directly here, rt6_mtu_change_route thinks that
it is unchanged, and so it fails to update the MSS accordingly.  This
patch lets rt6_mtu_change_route still update MSS if old_mtu == new_mtu.

Signed-off-by: Jim Paris <jim@jtan.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/route.c

index bf6b6652ab7927cae8a45249e0245962a33bfd56..513f72e3db0da00dc8f54bd9df7878054e92be33 100644 (file)
@@ -1909,7 +1909,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
         */
        if (rt->rt6i_dev == arg->dev &&
            !dst_metric_locked(&rt->u.dst, RTAX_MTU) &&
-           (dst_mtu(&rt->u.dst) > arg->mtu ||
+           (dst_mtu(&rt->u.dst) >= arg->mtu ||
             (dst_mtu(&rt->u.dst) < arg->mtu &&
              dst_mtu(&rt->u.dst) == idev->cnf.mtu6))) {
                rt->u.dst.metrics[RTAX_MTU-1] = arg->mtu;