https://bugs.gentoo.org/326849 allow ipv6 to be disabled --- a/ip/iptunnel.c +++ b/ip/iptunnel.c @@ -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); --- a/ip/Makefile +++ b/ip/Makefile @@ -1,6 +1,6 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ - rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ - ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \ + rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ + ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o \ ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ iplink_vlan.o link_veth.o link_gre.o iplink_can.o \ iplink_macvlan.o iplink_macvtap.o ipl2tp.o --- a/ip/ipmonitor.c +++ b/ip/ipmonitor.c @@ -76,7 +76,6 @@ int accept_msg(const struct sockaddr_nl *who, if (n->nlmsg_type == RTM_NEWPREFIX) { if (prefix_banner) fprintf(fp, "[PREFIX]"); - print_prefix(who, n, arg); return 0; } if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {