* 2.5.45 ipmr.c syntax error
@ 2002-10-31 4:45 Randy.Dunlap
2002-10-31 6:57 ` Skip Ford
0 siblings, 1 reply; 6+ messages in thread
From: Randy.Dunlap @ 2002-10-31 4:45 UTC (permalink / raw)
To: linux-kernel
gcc -Wp,-MD,net/ipv4/.ipmr.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=i686 -Iarch/i386/mach-generic -nostdinc -iwithprefix include
-DKBUILD_BASENAME=ipmr -c -o net/ipv4/ipmr.o net/ipv4/ipmr.c
net/ipv4/ipmr.c: In function `ipmr_forward_finish':
net/ipv4/ipmr.c:1114: structure has no member named `pmtu'
net/ipv4/ipmr.c: In function `ipmr_queue_xmit':
net/ipv4/ipmr.c:1170: structure has no member named `pmtu'
make[2]: *** [net/ipv4/ipmr.o] Error 1
make[1]: *** [net/ipv4] Error 2
make: *** [net] Error 2
On x86 (P4).
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 2.5.45 ipmr.c syntax error
2002-10-31 4:45 2.5.45 ipmr.c syntax error Randy.Dunlap
@ 2002-10-31 6:57 ` Skip Ford
2002-10-31 11:53 ` Jochen Friedrich
0 siblings, 1 reply; 6+ messages in thread
From: Skip Ford @ 2002-10-31 6:57 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: linux-kernel
Randy.Dunlap wrote:
> gcc -Wp,-MD,net/ipv4/.ipmr.o.d -D__KERNEL__ -Iinclude -Wall
> -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
> -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
> -march=i686 -Iarch/i386/mach-generic -nostdinc -iwithprefix include
> -DKBUILD_BASENAME=ipmr -c -o net/ipv4/ipmr.o net/ipv4/ipmr.c
> net/ipv4/ipmr.c: In function `ipmr_forward_finish':
> net/ipv4/ipmr.c:1114: structure has no member named `pmtu'
> net/ipv4/ipmr.c: In function `ipmr_queue_xmit':
> net/ipv4/ipmr.c:1170: structure has no member named `pmtu'
> make[2]: *** [net/ipv4/ipmr.o] Error 1
> make[1]: *** [net/ipv4] Error 2
> make: *** [net] Error 2
--- 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: 2.5.45 ipmr.c syntax error
2002-10-31 6:57 ` Skip Ford
@ 2002-10-31 11:53 ` Jochen Friedrich
2002-10-31 23:49 ` Skip Ford
0 siblings, 1 reply; 6+ messages in thread
From: Jochen Friedrich @ 2002-10-31 11:53 UTC (permalink / raw)
To: Skip Ford; +Cc: Randy.Dunlap, linux-kernel
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)?
--jochen
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: 2.5.45 ipmr.c syntax error
2002-10-31 11:53 ` Jochen Friedrich
@ 2002-10-31 23:49 ` Skip Ford
0 siblings, 0 replies; 6+ messages in thread
From: Skip Ford @ 2002-10-31 23:49 UTC (permalink / raw)
To: Jochen Friedrich; +Cc: Randy.Dunlap, linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 2.5.45 ipmr.c syntax error
@ 2002-11-01 1:26 Miles Lane
2002-11-01 3:14 ` Skip Ford
0 siblings, 1 reply; 6+ messages in thread
From: Miles Lane @ 2002-11-01 1:26 UTC (permalink / raw)
To: Skip Ford, linux-kernel
Skip, I tried your patch from:
http://marc.theaimsgroup.com/?l=linux-kernel&m=103604415923099&w=2
I got the following error after applying it:
gcc -Wp,-MD,net/ipv4/.ipmr.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=athlon -Iarch/i386/mach-generic -nostdinc -iwithprefix include
-DKBUILD_BASENAME=ipmr -c -o net/ipv4/ipmr.o net/ipv4/ipmr.c
net/ipv4/ipmr.c: In function `ipmr_queue_xmit':
net/ipv4/ipmr.c:1170: incompatible type for argument 1 of `dst_pmtu'
make[2]: *** [net/ipv4/ipmr.o] Error 1
make[1]: *** [net/ipv4] Error 2
make: *** [net] Error 2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 2.5.45 ipmr.c syntax error
2002-11-01 1:26 Miles Lane
@ 2002-11-01 3:14 ` Skip Ford
0 siblings, 0 replies; 6+ messages in thread
From: Skip Ford @ 2002-11-01 3:14 UTC (permalink / raw)
To: Miles Lane; +Cc: linux-kernel
Miles Lane wrote:
> Skip, I tried your patch from:
> http://marc.theaimsgroup.com/?l=linux-kernel&m=103604415923099&w=2
I goofed with that patch. This is the correct one. Sorry about that.
--- 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2002-11-01 2:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-10-31 4:45 2.5.45 ipmr.c syntax error Randy.Dunlap
2002-10-31 6:57 ` Skip Ford
2002-10-31 11:53 ` Jochen Friedrich
2002-10-31 23:49 ` Skip Ford
-- strict thread matches above, loose matches on Subject: below --
2002-11-01 1:26 Miles Lane
2002-11-01 3:14 ` Skip Ford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox