* 2.5.64 - netfilter ipv6 compile failure
@ 2003-03-05 15:32 CaT
2003-03-05 22:05 ` [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code Adrian Bunk
2003-03-05 22:59 ` [2.5 patch] remove all ipv6_ext_hdr's from ip6tables Adrian Bunk
0 siblings, 2 replies; 5+ messages in thread
From: CaT @ 2003-03-05 15:32 UTC (permalink / raw)
To: linux-kernel
Just tried to compile the kernel and got the compile errors below (I
started the past from the first line that produced errors until the
compile bombed out). relevant part of the .config is present after the
compile output.
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_rt.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_rt -DKBUILD_MODNAME=ip6t_rt -c -o net/ipv6/netfilter/.tmp_ip6t_rt.o net/ipv6/netfilter/ip6t_rt.c
net/ipv6/netfilter/ip6t_rt.c:14: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.c:14: warning: data definition has no type or storage class
net/ipv6/netfilter/ip6t_rt.c: In function `match':
net/ipv6/netfilter/ip6t_rt.c:145: warning: assignment from incompatible pointer type
scripts/fixdep net/ipv6/netfilter/.ip6t_rt.o.d net/ipv6/netfilter/ip6t_rt.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_rt.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_rt -DKBUILD_MODNAME=ip6t_rt -c -o net/ipv6/netfilter/.tmp_ip6t_rt.o net/ipv6/netfilter/ip6t_rt.c' > net/ipv6/netfilter/.ip6t_rt.o.tmp; rm -f net/ipv6/netfilter/.ip6t_rt.o.d; mv -f net/ipv6/netfilter/.ip6t_rt.o.tmp net/ipv6/netfilter/.ip6t_rt.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_hbh.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_hbh -DKBUILD_MODNAME=ip6t_hbh -c -o net/ipv6/netfilter/.tmp_ip6t_hbh.o net/ipv6/netfilter/ip6t_hbh.c
net/ipv6/netfilter/ip6t_hbh.c:18: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_hbh.c:18: warning: data definition has no type or storage class
scripts/fixdep net/ipv6/netfilter/.ip6t_hbh.o.d net/ipv6/netfilter/ip6t_hbh.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_hbh.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_hbh -DKBUILD_MODNAME=ip6t_hbh -c -o net/ipv6/netfilter/.tmp_ip6t_hbh.o net/ipv6/netfilter/ip6t_hbh.c' > net/ipv6/netfilter/.ip6t_hbh.o.tmp; rm -f net/ipv6/netfilter/.ip6t_hbh.o.d; mv -f net/ipv6/netfilter/.ip6t_hbh.o.tmp net/ipv6/netfilter/.ip6t_hbh.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_dst.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_dst -DKBUILD_MODNAME=ip6t_dst -c -o net/ipv6/netfilter/.tmp_ip6t_dst.o net/ipv6/netfilter/ip6t_dst.c
net/ipv6/netfilter/ip6t_dst.c:18: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_dst.c:18: warning: data definition has no type or storage class
scripts/fixdep net/ipv6/netfilter/.ip6t_dst.o.d net/ipv6/netfilter/ip6t_dst.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_dst.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_dst -DKBUILD_MODNAME=ip6t_dst -c -o net/ipv6/netfilter/.tmp_ip6t_dst.o net/ipv6/netfilter/ip6t_dst.c' > net/ipv6/netfilter/.ip6t_dst.o.tmp; rm -f net/ipv6/netfilter/.ip6t_dst.o.d; mv -f net/ipv6/netfilter/.ip6t_dst.o.tmp net/ipv6/netfilter/.ip6t_dst.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_ipv6header.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_ipv6header -DKBUILD_MODNAME=ip6t_ipv6header -c -o net/ipv6/netfilter/.tmp_ip6t_ipv6header.o net/ipv6/netfilter/ip6t_ipv6header.c
net/ipv6/netfilter/ip6t_ipv6header.c:17: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_ipv6header.c:17: warning: data definition has no type or storage class
net/ipv6/netfilter/ip6t_ipv6header.c: In function `ipv6header_match':
net/ipv6/netfilter/ip6t_ipv6header.c:54: warning: unused variable `opt'
scripts/fixdep net/ipv6/netfilter/.ip6t_ipv6header.o.d net/ipv6/netfilter/ip6t_ipv6header.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_ipv6header.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_ipv6header -DKBUILD_MODNAME=ip6t_ipv6header -c -o net/ipv6/netfilter/.tmp_ip6t_ipv6header.o net/ipv6/netfilter/ip6t_ipv6header.c' > net/ipv6/netfilter/.ip6t_ipv6header.o.tmp; rm -f net/ipv6/netfilter/.ip6t_ipv6header.o.d; mv -f net/ipv6/netfilter/.ip6t_ipv6header.o.tmp net/ipv6/netfilter/.ip6t_ipv6header.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_frag.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_frag -DKBUILD_MODNAME=ip6t_frag -c -o net/ipv6/netfilter/.tmp_ip6t_frag.o net/ipv6/netfilter/ip6t_frag.c
net/ipv6/netfilter/ip6t_frag.c:14: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_frag.c:14: warning: data definition has no type or storage class
net/ipv6/netfilter/ip6t_frag.c: In function `match':
net/ipv6/netfilter/ip6t_frag.c:162: warning: assignment from incompatible pointer type
scripts/fixdep net/ipv6/netfilter/.ip6t_frag.o.d net/ipv6/netfilter/ip6t_frag.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_frag.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_frag -DKBUILD_MODNAME=ip6t_frag -c -o net/ipv6/netfilter/.tmp_ip6t_frag.o net/ipv6/netfilter/ip6t_frag.c' > net/ipv6/netfilter/.ip6t_frag.o.tmp; rm -f net/ipv6/netfilter/.ip6t_frag.o.d; mv -f net/ipv6/netfilter/.ip6t_frag.o.tmp net/ipv6/netfilter/.ip6t_frag.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_esp.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_esp -DKBUILD_MODNAME=ip6t_esp -c -o net/ipv6/netfilter/.tmp_ip6t_esp.o net/ipv6/netfilter/ip6t_esp.c
net/ipv6/netfilter/ip6t_esp.c:12: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_esp.c:12: warning: data definition has no type or storage class
net/ipv6/netfilter/ip6t_esp.c: In function `match':
net/ipv6/netfilter/ip6t_esp.c:138: warning: assignment from incompatible pointer type
scripts/fixdep net/ipv6/netfilter/.ip6t_esp.o.d net/ipv6/netfilter/ip6t_esp.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_esp.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_esp -DKBUILD_MODNAME=ip6t_esp -c -o net/ipv6/netfilter/.tmp_ip6t_esp.o net/ipv6/netfilter/ip6t_esp.c' > net/ipv6/netfilter/.ip6t_esp.o.tmp; rm -f net/ipv6/netfilter/.ip6t_esp.o.d; mv -f net/ipv6/netfilter/.ip6t_esp.o.tmp net/ipv6/netfilter/.ip6t_esp.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_ah.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_ah -DKBUILD_MODNAME=ip6t_ah -c -o net/ipv6/netfilter/.tmp_ip6t_ah.o net/ipv6/netfilter/ip6t_ah.c
net/ipv6/netfilter/ip6t_ah.c:12: warning: type defaults to `int' in declaration of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_ah.c:12: warning: data definition has no type or storage class
net/ipv6/netfilter/ip6t_ah.c: In function `match':
net/ipv6/netfilter/ip6t_ah.c:148: warning: assignment from incompatible pointer type
scripts/fixdep net/ipv6/netfilter/.ip6t_ah.o.d net/ipv6/netfilter/ip6t_ah.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_ah.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_ah -DKBUILD_MODNAME=ip6t_ah -c -o net/ipv6/netfilter/.tmp_ip6t_ah.o net/ipv6/netfilter/ip6t_ah.c' > net/ipv6/netfilter/.ip6t_ah.o.tmp; rm -f net/ipv6/netfilter/.ip6t_ah.o.d; mv -f net/ipv6/netfilter/.ip6t_ah.o.tmp net/ipv6/netfilter/.ip6t_ah.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_eui64.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_eui64 -DKBUILD_MODNAME=ip6t_eui64 -c -o net/ipv6/netfilter/.tmp_ip6t_eui64.o net/ipv6/netfilter/ip6t_eui64.c
scripts/fixdep net/ipv6/netfilter/.ip6t_eui64.o.d net/ipv6/netfilter/ip6t_eui64.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_eui64.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_eui64 -DKBUILD_MODNAME=ip6t_eui64 -c -o net/ipv6/netfilter/.tmp_ip6t_eui64.o net/ipv6/netfilter/ip6t_eui64.c' > net/ipv6/netfilter/.ip6t_eui64.o.tmp; rm -f net/ipv6/netfilter/.ip6t_eui64.o.d; mv -f net/ipv6/netfilter/.ip6t_eui64.o.tmp net/ipv6/netfilter/.ip6t_eui64.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_multiport.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_multiport -DKBUILD_MODNAME=ip6t_multiport -c -o net/ipv6/netfilter/.tmp_ip6t_multiport.o net/ipv6/netfilter/ip6t_multiport.c
scripts/fixdep net/ipv6/netfilter/.ip6t_multiport.o.d net/ipv6/netfilter/ip6t_multiport.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_multiport.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_multiport -DKBUILD_MODNAME=ip6t_multiport -c -o net/ipv6/netfilter/.tmp_ip6t_multiport.o net/ipv6/netfilter/ip6t_multiport.c' > net/ipv6/netfilter/.ip6t_multiport.o.tmp; rm -f net/ipv6/netfilter/.ip6t_multiport.o.d; mv -f net/ipv6/netfilter/.ip6t_multiport.o.tmp net/ipv6/netfilter/.ip6t_multiport.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_owner.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_owner -DKBUILD_MODNAME=ip6t_owner -c -o net/ipv6/netfilter/.tmp_ip6t_owner.o net/ipv6/netfilter/ip6t_owner.c
scripts/fixdep net/ipv6/netfilter/.ip6t_owner.o.d net/ipv6/netfilter/ip6t_owner.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_owner.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_owner -DKBUILD_MODNAME=ip6t_owner -c -o net/ipv6/netfilter/.tmp_ip6t_owner.o net/ipv6/netfilter/ip6t_owner.c' > net/ipv6/netfilter/.ip6t_owner.o.tmp; rm -f net/ipv6/netfilter/.ip6t_owner.o.d; mv -f net/ipv6/netfilter/.ip6t_owner.o.tmp net/ipv6/netfilter/.ip6t_owner.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6table_filter.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6table_filter -DKBUILD_MODNAME=ip6table_filter -c -o net/ipv6/netfilter/.tmp_ip6table_filter.o net/ipv6/netfilter/ip6table_filter.c
scripts/fixdep net/ipv6/netfilter/.ip6table_filter.o.d net/ipv6/netfilter/ip6table_filter.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6table_filter.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6table_filter -DKBUILD_MODNAME=ip6table_filter -c -o net/ipv6/netfilter/.tmp_ip6table_filter.o net/ipv6/netfilter/ip6table_filter.c' > net/ipv6/netfilter/.ip6table_filter.o.tmp; rm -f net/ipv6/netfilter/.ip6table_filter.o.d; mv -f net/ipv6/netfilter/.ip6table_filter.o.tmp net/ipv6/netfilter/.ip6table_filter.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6table_mangle.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6table_mangle -DKBUILD_MODNAME=ip6table_mangle -c -o net/ipv6/netfilter/.tmp_ip6table_mangle.o net/ipv6/netfilter/ip6table_mangle.c
scripts/fixdep net/ipv6/netfilter/.ip6table_mangle.o.d net/ipv6/netfilter/ip6table_mangle.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6table_mangle.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6table_mangle -DKBUILD_MODNAME=ip6table_mangle -c -o net/ipv6/netfilter/.tmp_ip6table_mangle.o net/ipv6/netfilter/ip6table_mangle.c' > net/ipv6/netfilter/.ip6table_mangle.o.tmp; rm -f net/ipv6/netfilter/.ip6table_mangle.o.d; mv -f net/ipv6/netfilter/.ip6table_mangle.o.tmp net/ipv6/netfilter/.ip6table_mangle.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_MARK.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_MARK -DKBUILD_MODNAME=ip6t_MARK -c -o net/ipv6/netfilter/.tmp_ip6t_MARK.o net/ipv6/netfilter/ip6t_MARK.c
scripts/fixdep net/ipv6/netfilter/.ip6t_MARK.o.d net/ipv6/netfilter/ip6t_MARK.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_MARK.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_MARK -DKBUILD_MODNAME=ip6t_MARK -c -o net/ipv6/netfilter/.tmp_ip6t_MARK.o net/ipv6/netfilter/ip6t_MARK.c' > net/ipv6/netfilter/.ip6t_MARK.o.tmp; rm -f net/ipv6/netfilter/.ip6t_MARK.o.d; mv -f net/ipv6/netfilter/.ip6t_MARK.o.tmp net/ipv6/netfilter/.ip6t_MARK.o.cmd
gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_LOG.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_LOG -DKBUILD_MODNAME=ip6t_LOG -c -o net/ipv6/netfilter/.tmp_ip6t_LOG.o net/ipv6/netfilter/ip6t_LOG.c
scripts/fixdep net/ipv6/netfilter/.ip6t_LOG.o.d net/ipv6/netfilter/ip6t_LOG.o 'gcc -Wp,-MD,net/ipv6/netfilter/.ip6t_LOG.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DKBUILD_BASENAME=ip6t_LOG -DKBUILD_MODNAME=ip6t_LOG -c -o net/ipv6/netfilter/.tmp_ip6t_LOG.o net/ipv6/netfilter/ip6t_LOG.c' > net/ipv6/netfilter/.ip6t_LOG.o.tmp; rm -f net/ipv6/netfilter/.ip6t_LOG.o.d; mv -f net/ipv6/netfilter/.ip6t_LOG.o.tmp net/ipv6/netfilter/.ip6t_LOG.o.cmd
ld -m elf_i386 -r -o net/ipv6/netfilter/built-in.o net/ipv6/netfilter/ip6_tables.o net/ipv6/netfilter/ip6t_limit.o net/ipv6/netfilter/ip6t_mark.o net/ipv6/netfilter/ip6t_length.o net/ipv6/netfilter/ip6t_mac.o net/ipv6/netfilter/ip6t_rt.o net/ipv6/netfilter/ip6t_hbh.o net/ipv6/netfilter/ip6t_dst.o net/ipv6/netfilter/ip6t_ipv6header.o net/ipv6/netfilter/ip6t_frag.o net/ipv6/netfilter/ip6t_esp.o net/ipv6/netfilter/ip6t_ah.o net/ipv6/netfilter/ip6t_eui64.o net/ipv6/netfilter/ip6t_multiport.o net/ipv6/netfilter/ip6t_owner.o net/ipv6/netfilter/ip6table_filter.o net/ipv6/netfilter/ip6table_mangle.o net/ipv6/netfilter/ip6t_MARK.o net/ipv6/netfilter/ip6t_LOG.o
net/ipv6/netfilter/ip6t_hbh.o: In function `ipv6_ext_hdr':
net/ipv6/netfilter/ip6t_hbh.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
net/ipv6/netfilter/ip6t_hbh.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
net/ipv6/netfilter/ip6t_dst.o: In function `ipv6_ext_hdr':
net/ipv6/netfilter/ip6t_dst.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
net/ipv6/netfilter/ip6t_dst.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
net/ipv6/netfilter/ip6t_ipv6header.o: In function `ipv6_ext_hdr':
net/ipv6/netfilter/ip6t_ipv6header.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
net/ipv6/netfilter/ip6t_ipv6header.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
net/ipv6/netfilter/ip6t_frag.o: In function `ipv6_ext_hdr':
net/ipv6/netfilter/ip6t_frag.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
net/ipv6/netfilter/ip6t_frag.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
net/ipv6/netfilter/ip6t_esp.o: In function `ipv6_ext_hdr':
net/ipv6/netfilter/ip6t_esp.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
net/ipv6/netfilter/ip6t_esp.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
net/ipv6/netfilter/ip6t_ah.o: In function `ipv6_ext_hdr':
net/ipv6/netfilter/ip6t_ah.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
net/ipv6/netfilter/ip6t_ah.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
make[3]: *** [net/ipv6/netfilter/built-in.o] Error 1
make[2]: *** [net/ipv6/netfilter] Error 2
make[1]: *** [net/ipv6] Error 2
make: *** [net] Error 2
--- 8< ---
CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
# IPv6: Netfilter Configuration
#
# CONFIG_IP6_NF_QUEUE is not set
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_LIMIT=y
CONFIG_IP6_NF_MATCH_MAC=y
CONFIG_IP6_NF_MATCH_RT=y
CONFIG_IP6_NF_MATCH_OPTS=y
CONFIG_IP6_NF_MATCH_FRAG=y
CONFIG_IP6_NF_MATCH_HL=y
CONFIG_IP6_NF_MATCH_MULTIPORT=y
CONFIG_IP6_NF_MATCH_OWNER=y
CONFIG_IP6_NF_MATCH_MARK=y
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
CONFIG_IP6_NF_MATCH_AHESP=y
CONFIG_IP6_NF_MATCH_LENGTH=y
CONFIG_IP6_NF_MATCH_EUI64=y
CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_LOG=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_TARGET_MARK=y
CONFIG_IPV6_SCTP__=y
#
# Cryptographic options
#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_BLOWFISH=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_SERPENT=y
CONFIG_CRYPTO_AES=y
If you need more info or for me to test patches, please yell. :)
--
"Other countries of course, bear the same risk. But there's no doubt his
hatred is mainly directed at us. After all this is the guy who tried to kill my dad."
- George W. Bush Jr, 'President' of the United States
September 26, 2002 (from a political fundraiser in Huston, Texas)
^ permalink raw reply [flat|nested] 5+ messages in thread* [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code
2003-03-05 15:32 2.5.64 - netfilter ipv6 compile failure CaT
@ 2003-03-05 22:05 ` Adrian Bunk
2003-03-06 1:09 ` Harald Welte
2003-03-05 22:59 ` [2.5 patch] remove all ipv6_ext_hdr's from ip6tables Adrian Bunk
1 sibling, 1 reply; 5+ messages in thread
From: Adrian Bunk @ 2003-03-05 22:05 UTC (permalink / raw)
To: CaT, laforge; +Cc: linux-kernel, trivial
On Thu, Mar 06, 2003 at 02:32:59AM +1100, CaT wrote:
>...
> net/ipv6/netfilter/ip6t_hbh.o(.bss+0x0): multiple definition of `EXPORT_NO_SYMBOLS'
> net/ipv6/netfilter/ip6t_rt.o(.bss+0x0): first defined here
>...
The patch that added new ip6tables matches in 2.5.64 added seven
occurances of the obsolete EXPORT_NO_SYMBOLS. The patch below removes
them.
cu
Adrian
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ah.c.old 2003-03-05 22:57:24.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ah.c 2003-03-05 22:57:41.000000000 +0100
@@ -9,7 +9,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_ah.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 AH match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_dst.c.old 2003-03-05 22:58:18.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_dst.c 2003-03-05 22:58:31.000000000 +0100
@@ -15,7 +15,6 @@
#define HOPBYHOP 0
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
#if HOPBYHOP
MODULE_DESCRIPTION("IPv6 HbH match");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_esp.c.old 2003-03-05 22:59:57.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_esp.c 2003-03-05 23:00:03.000000000 +0100
@@ -9,7 +9,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_esp.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 ESP match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_frag.c.old 2003-03-05 23:00:04.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_frag.c 2003-03-05 23:00:10.000000000 +0100
@@ -11,7 +11,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_frag.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 FRAG match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_hbh.c.old 2003-03-05 23:00:11.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_hbh.c 2003-03-05 23:00:17.000000000 +0100
@@ -15,7 +15,6 @@
#define HOPBYHOP 1
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
#if HOPBYHOP
MODULE_DESCRIPTION("IPv6 HbH match");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ipv6header.c.old 2003-03-05 23:00:17.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ipv6header.c 2003-03-05 23:00:24.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_ipv6header.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 headers match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_rt.c.old 2003-03-05 23:00:24.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_rt.c 2003-03-05 23:00:30.000000000 +0100
@@ -11,7 +11,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_rt.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 RT match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code
2003-03-05 22:05 ` [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code Adrian Bunk
@ 2003-03-06 1:09 ` Harald Welte
2003-03-06 16:53 ` David S. Miller
0 siblings, 1 reply; 5+ messages in thread
From: Harald Welte @ 2003-03-06 1:09 UTC (permalink / raw)
To: Adrian Bunk; +Cc: CaT, linux-kernel, David Miller
[-- Attachment #1: Type: text/plain, Size: 3744 bytes --]
On Wed, Mar 05, 2003 at 11:05:42PM +0100, Adrian Bunk wrote:
> The patch that added new ip6tables matches in 2.5.64 added seven
> occurances of the obsolete EXPORT_NO_SYMBOLS. The patch below removes
> them.
Thanks, this was my fault. I submitted one patch (for 2.4 and 2.5) to
davem... and obviously this is no longer possible with the intrusive
changes of 2.5.x ...
Davem, please include this into your 2.5.x tree. Thanks.
> cu
> Adrian
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ah.c.old 2003-03-05 22:57:24.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ah.c 2003-03-05 22:57:41.000000000 +0100
@@ -9,7 +9,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_ah.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 AH match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_dst.c.old 2003-03-05 22:58:18.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_dst.c 2003-03-05 22:58:31.000000000 +0100
@@ -15,7 +15,6 @@
#define HOPBYHOP 0
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
#if HOPBYHOP
MODULE_DESCRIPTION("IPv6 HbH match");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_esp.c.old 2003-03-05 22:59:57.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_esp.c 2003-03-05 23:00:03.000000000 +0100
@@ -9,7 +9,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_esp.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 ESP match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_frag.c.old 2003-03-05 23:00:04.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_frag.c 2003-03-05 23:00:10.000000000 +0100
@@ -11,7 +11,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_frag.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 FRAG match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_hbh.c.old 2003-03-05 23:00:11.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_hbh.c 2003-03-05 23:00:17.000000000 +0100
@@ -15,7 +15,6 @@
#define HOPBYHOP 1
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
#if HOPBYHOP
MODULE_DESCRIPTION("IPv6 HbH match");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ipv6header.c.old 2003-03-05 23:00:17.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ipv6header.c 2003-03-05 23:00:24.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_ipv6header.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 headers match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_rt.c.old 2003-03-05 23:00:24.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_rt.c 2003-03-05 23:00:30.000000000 +0100
@@ -11,7 +11,6 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv6/ip6t_rt.h>
-EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IPv6 RT match");
MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
--
- Harald Welte <laforge@netfilter.org> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code
2003-03-06 1:09 ` Harald Welte
@ 2003-03-06 16:53 ` David S. Miller
0 siblings, 0 replies; 5+ messages in thread
From: David S. Miller @ 2003-03-06 16:53 UTC (permalink / raw)
To: laforge; +Cc: bunk, cat, linux-kernel
From: Harald Welte <laforge@netfilter.org>
Date: Thu, 6 Mar 2003 02:09:20 +0100
On Wed, Mar 05, 2003 at 11:05:42PM +0100, Adrian Bunk wrote:
> The patch that added new ip6tables matches in 2.5.64 added seven
> occurances of the obsolete EXPORT_NO_SYMBOLS. The patch below removes
> them.
Thanks, this was my fault. I submitted one patch (for 2.4 and 2.5) to
davem... and obviously this is no longer possible with the intrusive
changes of 2.5.x ...
Davem, please include this into your 2.5.x tree. Thanks.
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [2.5 patch] remove all ipv6_ext_hdr's from ip6tables
2003-03-05 15:32 2.5.64 - netfilter ipv6 compile failure CaT
2003-03-05 22:05 ` [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code Adrian Bunk
@ 2003-03-05 22:59 ` Adrian Bunk
1 sibling, 0 replies; 5+ messages in thread
From: Adrian Bunk @ 2003-03-05 22:59 UTC (permalink / raw)
To: CaT, laforge; +Cc: linux-kernel
On Thu, Mar 06, 2003 at 02:32:59AM +1100, CaT wrote:
>...
> net/ipv6/netfilter/ip6t_dst.o: In function `ipv6_ext_hdr':
> net/ipv6/netfilter/ip6t_dst.o(.text+0x0): multiple definition of `ipv6_ext_hdr'
> net/ipv6/netfilter/ip6t_rt.o(.text+0x0): first defined here
>...
I don't understand why someone added an ipv6_ext_hdr to every single
file instead of using the ip6t_ext_hdr that is already present in
ip6_tables.c. The patch below fixes this problem.
cu
Adrian
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ah.c.old 2003-03-05 23:30:00.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ah.c 2003-03-05 23:30:43.000000000 +0100
@@ -26,17 +26,6 @@
__u32 spi;
};
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
/* Returns 1 if the spi is matched by the range, 0 otherwise */
static inline int
spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
@@ -79,7 +68,7 @@
len = skb->len - ptr;
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_ah header iteration \n");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_dst.c.old 2003-03-05 23:30:44.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_dst.c 2003-03-05 23:31:01.000000000 +0100
@@ -29,17 +29,6 @@
#define DEBUGP(format, args...)
#endif
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
/*
* (Type & 0xC0) >> 6
* 0 -> ignorable
@@ -84,7 +73,7 @@
len = skb->len - ptr;
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_opts header iteration \n");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_esp.c.old 2003-03-05 23:31:02.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_esp.c 2003-03-05 23:31:22.000000000 +0100
@@ -23,17 +23,6 @@
__u32 spi;
};
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
/* Returns 1 if the spi is matched by the range, 0 otherwise */
static inline int
spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
@@ -74,7 +63,7 @@
len = skb->len - ptr;
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
int hdrlen;
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_frag.c.old 2003-03-05 23:31:23.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_frag.c 2003-03-05 23:31:45.000000000 +0100
@@ -44,17 +44,6 @@
__u32 id;
};
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
/* Returns 1 if the id is matched by the range, 0 otherwise */
static inline int
id_match(u_int32_t min, u_int32_t max, u_int32_t id, int invert)
@@ -93,7 +82,7 @@
len = skb->len - ptr;
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_frag header iteration \n");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_hbh.c.old 2003-03-05 23:31:45.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_hbh.c 2003-03-05 23:32:01.000000000 +0100
@@ -29,17 +29,6 @@
#define DEBUGP(format, args...)
#endif
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
/*
* (Type & 0xC0) >> 6
* 0 -> ignorable
@@ -84,7 +73,7 @@
len = skb->len - ptr;
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_opts header iteration \n");
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ipv6header.c.old 2003-03-05 23:32:02.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_ipv6header.c 2003-03-05 23:32:26.000000000 +0100
@@ -24,17 +24,6 @@
#define DEBUGP(format, args...)
#endif
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
static int
ipv6header_match(const struct sk_buff *skb,
const struct net_device *in,
@@ -95,7 +84,7 @@
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
int hdrlen;
--- linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_rt.c.old 2003-03-05 23:32:26.000000000 +0100
+++ linux-2.5.64-notfull/net/ipv6/netfilter/ip6t_rt.c 2003-03-05 23:32:40.000000000 +0100
@@ -21,17 +21,6 @@
#define DEBUGP(format, args...)
#endif
-int ipv6_ext_hdr(u8 nexthdr)
-{
- return ( (nexthdr == NEXTHDR_HOP) ||
- (nexthdr == NEXTHDR_ROUTING) ||
- (nexthdr == NEXTHDR_FRAGMENT) ||
- (nexthdr == NEXTHDR_AUTH) ||
- (nexthdr == NEXTHDR_ESP) ||
- (nexthdr == NEXTHDR_NONE) ||
- (nexthdr == NEXTHDR_DEST) );
-}
-
/* Returns 1 if the id is matched by the range, 0 otherwise */
static inline int
segsleft_match(u_int32_t min, u_int32_t max, u_int32_t id, int invert)
@@ -71,7 +60,7 @@
len = skb->len - ptr;
temp = 0;
- while (ipv6_ext_hdr(nexthdr)) {
+ while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_rt header iteration \n");
--- linux-2.5.64-notfull/include/linux/netfilter_ipv6/ip6_tables.h.old 2003-03-05 23:36:49.000000000 +0100
+++ linux-2.5.64-notfull/include/linux/netfilter_ipv6/ip6_tables.h 2003-03-05 23:49:51.000000000 +0100
@@ -449,6 +449,9 @@
struct ip6t_table *table,
void *userdata);
+/* Check for an extension */
+extern int ip6t_ext_hdr(u8 nexthdr);
+
#define IP6T_ALIGN(s) (((s) + (__alignof__(struct ip6t_entry)-1)) & ~(__alignof__(struct ip6t_entry)-1))
#endif /*__KERNEL__*/
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2003-03-06 17:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-03-05 15:32 2.5.64 - netfilter ipv6 compile failure CaT
2003-03-05 22:05 ` [2.5 patch] remove EXPORT_NO_SYMBOLS from ip6tables code Adrian Bunk
2003-03-06 1:09 ` Harald Welte
2003-03-06 16:53 ` David S. Miller
2003-03-05 22:59 ` [2.5 patch] remove all ipv6_ext_hdr's from ip6tables Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox