2.5.45 ipmr.c syntax error

DISCUSSION Randy.Dunlap 3 participants 4 messages Oct 31, 2002

Subsystems (2)

Networking IPv4/IPv6

lore

Share & tools

lore

Randy.Dunlap

author

2002-10-31 05:40 UTC #0 lore raw

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

Skip Ford

2002-10-31 05:54 UTC #1 lore raw

Quoted 5 lines · Randy.Dunlap

gcc -Wp,-MD,net/ipv4/.ipmr.o.d -D__KERNEL__ -Iinclude -Wall

(quoted diff) +0 -4

-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

Quoted 7 lines

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

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

Jochen Friedrich

2002-10-31 11:53 UTC #2 lore raw

Hi Skip,

net/ipv4/ipmr.c line 1170

Quoted 2 lines

net/ipv4/ipmr.c renamed from net/ipv4/ipmr.c~ +1 -1

-	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

Skip Ford

2002-10-31 22:45 UTC #3 lore raw

Quoted 6 lines · Jochen Friedrich

Hi Skip,
Review
Quoted 2 lines
(quoted diff) +1 -1
-	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.

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