Re: 2.5.45 ipmr.c syntax error

From: Skip Ford (skip.ford@verizon.net)
Date: Thu Oct 31 2002 - 18:49:18 EST

Next message: Dieter Nützel: "Re: [BK][PATCH] Reiser4, will double Linux FS performance, please apply"
Previous message: Dieter Nützel: "Re: Reiser vs EXT3"
In reply to: Jochen Friedrich: "Re: 2.5.45 ipmr.c syntax error"
Next in thread: Miles Lane: "Re: 2.5.45 ipmr.c syntax error"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Jochen Friedrich wrote:
> Hi Skip,
>
> > - if (skb->len+encap > rt->u.dst.pmtu && (ntohs(iph->frag_off) & IP_DF)) {
> > + if (skb->len+encap > dst_pmtu(rt->u.dst) && (ntohs(iph->frag_off) & IP_DF)) {
>
> Shouldn't that be dst_pmtu(&rt->u.dst)?

Yep, you're right. Thanks.

--- linux/net/ipv4/ipmr.c~ Thu Oct 31 01:54:40 2002
+++ linux/net/ipv4/ipmr.c Thu Oct 31 01:55:31 2002
@@ -1111,7 +1111,7 @@
{
         struct dst_entry *dst = skb->dst;

- if (skb->len <= dst->pmtu)
+ if (skb->len <= dst_pmtu(dst))
                 return dst->output(skb);
         else
                 return ip_fragment(skb, dst->output);
@@ -1167,7 +1167,7 @@

         dev = rt->u.dst.dev;

- if (skb->len+encap > rt->u.dst.pmtu && (ntohs(iph->frag_off) & IP_DF)) {
+ if (skb->len+encap > dst_pmtu(&rt->u.dst) && (ntohs(iph->frag_off) & IP_DF)) {
                 /* Do not fragment multicasts. Alas, IPv4 does not
                    allow to send ICMP, so that packets will disappear
                    to blackhole.

-- 
Skip
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Next message: Dieter Nützel: "Re: [BK][PATCH] Reiser4, will double Linux FS performance, please apply"
Previous message: Dieter Nützel: "Re: Reiser vs EXT3"
In reply to: Jochen Friedrich: "Re: 2.5.45 ipmr.c syntax error"
Next in thread: Miles Lane: "Re: 2.5.45 ipmr.c syntax error"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Thu Oct 31 2002 - 22:00:57 EST