We no longer have a global ICMP timer (timers for individual flows are
handled through the flow timer). We still have an ICMP_TIMER_INTERVAL
define, though. Remove it.
Signed-off-by: David Gibson
---
icmp.h | 2 --
passt.c | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/icmp.h b/icmp.h
index d1cecb20..1a0e6205 100644
--- a/icmp.h
+++ b/icmp.h
@@ -6,8 +6,6 @@
#ifndef ICMP_H
#define ICMP_H
-#define ICMP_TIMER_INTERVAL 10000 /* ms */
-
struct ctx;
struct icmp_ping_flow;
diff --git a/passt.c b/passt.c
index dc3e1141..5d3ad55c 100644
--- a/passt.c
+++ b/passt.c
@@ -57,8 +57,7 @@
#define NUM_EPOLL_EVENTS 8
-#define TIMER_INTERVAL__ MIN(TCP_TIMER_INTERVAL, UDP_TIMER_INTERVAL)
-#define TIMER_INTERVAL_ MIN(TIMER_INTERVAL__, ICMP_TIMER_INTERVAL)
+#define TIMER_INTERVAL_ MIN(TCP_TIMER_INTERVAL, UDP_TIMER_INTERVAL)
#define TIMER_INTERVAL MIN(TIMER_INTERVAL_, FLOW_TIMER_INTERVAL)
char pkt_buf[PKT_BUF_BYTES] __attribute__ ((aligned(PAGE_SIZE)));
--
2.51.0