Apply local Android modifications to ping.
This just copies files from external/ping to external/iputils.
Bug: 9469682
Change-Id: Id55cdd44e7908f1ac1faffb65eea372969de15fc
diff --git a/in6_flowlabel.h b/in6_flowlabel.h
index 68b58d6..9a27397 100644
--- a/in6_flowlabel.h
+++ b/in6_flowlabel.h
@@ -1,39 +1,4 @@
-/*
- It is just a stripped copy of the kernel header "linux/in6.h"
-
- "Flow label" things are still not defined in "netinet/in*.h" headers,
- but we cannot use "linux/in6.h" immediately because it currently
- conflicts with "netinet/in.h" .
-*/
-
-struct in6_flowlabel_req
-{
- struct in6_addr flr_dst;
- __u32 flr_label;
- __u8 flr_action;
- __u8 flr_share;
- __u16 flr_flags;
- __u16 flr_expires;
- __u16 flr_linger;
- __u32 __flr_pad;
- /* Options in format of IPV6_PKTOPTIONS */
-};
-
-#define IPV6_FL_A_GET 0
-#define IPV6_FL_A_PUT 1
-#define IPV6_FL_A_RENEW 2
-
-#define IPV6_FL_F_CREATE 1
-#define IPV6_FL_F_EXCL 2
-
-#define IPV6_FL_S_NONE 0
-#define IPV6_FL_S_EXCL 1
-#define IPV6_FL_S_PROCESS 2
-#define IPV6_FL_S_USER 3
-#define IPV6_FL_S_ANY 255
-
-#define IPV6_FLOWINFO_FLOWLABEL 0x000fffff
-#define IPV6_FLOWINFO_PRIORITY 0x0ff00000
-
-#define IPV6_FLOWLABEL_MGR 32
-#define IPV6_FLOWINFO_SEND 33
+/* The in6_flowlabel.h file in the iputils distribution exists to provide
+ * kernel flowlabel API definitions that are not in the userspace headers
+ * because they are linux-specific. It's not needed on Android because Android
+ * exposes the kernel definitions to userspace directly . */