From aa1b5eae9c5281b519691d3026f38e834e57556a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 8 Jul 2013 11:10:06 -0700 Subject: Remove hacks now we've fixed bionic. Bug: 9671560 Change-Id: Id98c0a0be0842e61d638bc2d0124699f3ad6f55d --- ping6.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ping6.c b/ping6.c index 0c6ae5a..c39864d 100644 --- a/ping6.c +++ b/ping6.c @@ -112,20 +112,6 @@ char copyright[] = #define BIT_SET(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] |= (1U << ((nr) & 31)); } while(0) #define BIT_TEST(nr, addr) do { (__u32 *)(addr))[(nr) >> 5] & (1U << ((nr) & 31)); } while(0) -/* ICMP6_FILTER is defined in linux/icmpv6.h, which we can't include because it - * defines struct icmp6_filter, also defined in netinet/icmp6.h. Also, undefine - * the ICMP6_FILTER_XXX macros, because the ones provided by netinet/icmp6.h - * don't work on Linux - http://b/9671560 . */ -#ifdef ANDROID -#define ICMP6_FILTER 1 -#undef ICMP6_FILTER_WILLPASS -#undef ICMP6_FILTER_WILLBLOCK -#undef ICMP6_FILTER_SETPASS -#undef ICMP6_FILTER_SETBLOCK -#undef ICMP6_FILTER_SETPASSALL -#undef ICMP6_FILTER_SETBLOCKALL -#endif - #ifndef ICMP6_FILTER_WILLPASS #define ICMP6_FILTER_WILLPASS(type, filterp) \ (BIT_TEST((type), filterp) == 0) -- cgit v1.2.3