Remove the unused IPPROTO_{ICMP|ICMPV6|TCP|UDP} constants am: 4b33e23ae7
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/3023023
Change-Id: I5dbe069f7be74a42f662afb8e9726fd73b861d5b
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/apf_defs.h b/apf_defs.h
index af63025..e8426e6 100644
--- a/apf_defs.h
+++ b/apf_defs.h
@@ -16,22 +16,6 @@
#define ETH_P_IP 0x0800
#define ETH_P_IPV6 0x86DD
-#ifndef IPPROTO_ICMP
-#define IPPROTO_ICMP 1
-#endif
-
-#ifndef IPPROTO_TCP
-#define IPPROTO_TCP 6
-#endif
-
-#ifndef IPPROTO_UDP
-#define IPPROTO_UDP 17
-#endif
-
-#ifndef IPPROTO_ICMPV6
-#define IPPROTO_ICMPV6 58
-#endif
-
#define ETH_HLEN 14
#define IPV4_HLEN 20
#define IPV6_HLEN 40
diff --git a/v5/apf_interpreter.c b/v5/apf_interpreter.c
index 4bba410..16fce48 100644
--- a/v5/apf_interpreter.c
+++ b/v5/apf_interpreter.c
@@ -45,22 +45,6 @@
#define ETH_P_IP 0x0800
#define ETH_P_IPV6 0x86DD
-#ifndef IPPROTO_ICMP
-#define IPPROTO_ICMP 1
-#endif
-
-#ifndef IPPROTO_TCP
-#define IPPROTO_TCP 6
-#endif
-
-#ifndef IPPROTO_UDP
-#define IPPROTO_UDP 17
-#endif
-
-#ifndef IPPROTO_ICMPV6
-#define IPPROTO_ICMPV6 58
-#endif
-
#define ETH_HLEN 14
#define IPV4_HLEN 20
#define IPV6_HLEN 40