Code drop from //branches/cupcake/...@124589
diff --git a/Android.mk b/Android.mk
index 8f441d7..0985b10 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,6 +31,7 @@
print-cip.c\
print-cnfp.c\
print-dccp.c\
+ print-dhcp6.c\
print-decnet.c\
print-domain.c\
print-dvmrp.c\
@@ -42,12 +43,16 @@
print-ether.c\
print-fddi.c\
print-fr.c\
+ print-frag6.c\
print-gre.c\
print-hsrp.c\
print-icmp.c\
+ print-icmp6.c\
print-igmp.c\
print-igrp.c\
print-ip.c\
+ print-ip6.c\
+ print-ip6opts.c\
print-ipcomp.c\
print-ipfc.c\
print-ipx.c\
@@ -63,6 +68,7 @@
print-lspping.c\
print-lwres.c\
print-mobile.c\
+ print-mobility.c\
print-mpls.c\
print-msdp.c\
print-nfs.c\
@@ -70,6 +76,7 @@
print-null.c\
print-olsr.c\
print-ospf.c\
+ print-ospf6.c\
print-pgm.c\
print-pim.c\
print-ppp.c\
@@ -78,7 +85,9 @@
print-radius.c\
print-raw.c\
print-rip.c\
+ print-ripng.c\
print-rsvp.c\
+ print-rt6.c\
print-rx.c\
print-sctp.c\
print-sip.c\
diff --git a/config.h b/config.h
index 02ec721..76ba53b 100644
--- a/config.h
+++ b/config.h
@@ -7,7 +7,7 @@
/* #undef HAVE_BUGGY_CAST128 */
/* Define if you enable IPv6 support */
-/* #undef INET6 */
+#define INET6 1
/* Define if you enable support for the libsmi. */
/* #undef LIBSMI */
@@ -93,7 +93,7 @@
/* #undef HAVE_GETRPCBYNUMBER */
/* define if unaligned memory accesses fail */
-/* #undef LBL_ALIGN */
+#define LBL_ALIGN 1
/* The successful return value from signal (?)XXX */
#define RETSIGVAL
