Skip to contentSkip to conversation

2.5.45 ipmr.c syntax error

DISCUSSION Miles Lane 2 participants 2 messages Nov 1, 2002

Subsystems (2)
lore
Share & tools
lore

Miles Lane

author
#0 lore raw

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

#1 lore raw
Quoted 2 lines · Miles Lane

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.

net/ipv4/ipmr.c renamed from net/ipv4/ipmr.c~ +2 -2
@@ -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.
Signature · 1 line
Skip