--- iproute2-2.6.19-061214/ip/iptunnel.c.orig	2006-12-14 17:04:12 -0600
+++ iproute2-2.6.19-061214/ip/iptunnel.c	2007-01-20 01:21:41 -0600
@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv)
 		break;
 	case AF_INET:
 		break;
-	/*
-	 * This is silly enough but we have no easy way to make it
-	 * protocol-independent because of unarranged structure between
-	 * IPv4 and IPv6.
-	 */
-	case AF_INET6:
-		return do_ip6tunnel(argc, argv);
 	default:
 		fprintf(stderr, "Unsupported family:%d\n", preferred_family);
 		exit(-1);
--- iproute2-2.6.19-061214/ip/Makefile.orig	2007-01-20 01:25:08 -0600
+++ iproute2-2.6.19-061214/ip/Makefile	2007-01-20 01:25:16 -0600
@@ -1,5 +1,5 @@
 IPOBJ=ip.o ipaddress.o iproute.o iprule.o \
-    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
     ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \
     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o