flow: remove unneeded args to fn

diff --git a/src/flow-manager.c b/src/flow-manager.c
index 8ea8be3a043f86d5dd6bb2d34e41ad2a04fd672c..072a3cb74ad1877630bde9ecf9ffc6cac0b2e9fe 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -378,8 +378,7 @@ static void FlowManagerHashRowTimeout(FlowManagerTimeoutThread *td, Flow *f, SCT
  * \param td FM timeout thread instance
  * \param f head of the evicted list
  */
-static void FlowManagerHashRowClearEvictedList(
-        FlowManagerTimeoutThread *td, Flow *f, SCTime_t ts, FlowTimeoutCounters *counters)
+static void FlowManagerHashRowClearEvictedList(FlowManagerTimeoutThread *td, Flow *f)
 {
     do {
         FLOWLOCK_WRLOCK(f);
@@ -464,7 +463,7 @@ static uint32_t FlowTimeoutHash(FlowManagerTimeoutThread *td, SCTime_t ts, const
                 FBLOCK_UNLOCK(fb);
                 /* processed evicted list */
                 if (evicted) {
-                    FlowManagerHashRowClearEvictedList(td, evicted, ts, counters);
+                    FlowManagerHashRowClearEvictedList(td, evicted);
                 }
             } else {
                 rows_skipped++;

diff --git a/src/flow.c b/src/flow.c
index b43eae2088904a032922f00be7d568cb45c66dc5..e40a1ce7dd8074e637593ff70c9ae6adc5f21c7e 100644 (file)
--- a/src/flow.c
+++ b/src/flow.c
@@ -334,7 +334,7 @@ static inline int FlowUpdateSeenFlag(const Packet *p)
     return 1;
 }
 
-static inline void FlowUpdateTtlTS(Flow *f, Packet *p, uint8_t ttl)
+static inline void FlowUpdateTtlTS(Flow *f, uint8_t ttl)
 {
     if (f->min_ttl_toserver == 0) {
         f->min_ttl_toserver = ttl;
@@ -344,7 +344,7 @@ static inline void FlowUpdateTtlTS(Flow *f, Packet *p, uint8_t ttl)
     f->max_ttl_toserver = MAX(f->max_ttl_toserver, ttl);
 }
 
-static inline void FlowUpdateTtlTC(Flow *f, Packet *p, uint8_t ttl)
+static inline void FlowUpdateTtlTC(Flow *f, uint8_t ttl)
 {
     if (f->min_ttl_toclient == 0) {
         f->min_ttl_toclient = ttl;
@@ -437,10 +437,10 @@ void FlowHandlePacketUpdate(Flow *f, Packet *p, ThreadVars *tv, DecodeThreadVars
         /* update flow's ttl fields if needed */
         if (PacketIsIPv4(p)) {
             const IPV4Hdr *ip4h = PacketGetIPv4(p);
-            FlowUpdateTtlTS(f, p, IPV4_GET_RAW_IPTTL(ip4h));
+            FlowUpdateTtlTS(f, IPV4_GET_RAW_IPTTL(ip4h));
         } else if (PacketIsIPv6(p)) {
             const IPV6Hdr *ip6h = PacketGetIPv6(p);
-            FlowUpdateTtlTS(f, p, IPV6_GET_RAW_HLIM(ip6h));
+            FlowUpdateTtlTS(f, IPV6_GET_RAW_HLIM(ip6h));
         }
     } else {
         f->tosrcpktcnt++;
@@ -461,10 +461,10 @@ void FlowHandlePacketUpdate(Flow *f, Packet *p, ThreadVars *tv, DecodeThreadVars
         /* update flow's ttl fields if needed */
         if (PacketIsIPv4(p)) {
             const IPV4Hdr *ip4h = PacketGetIPv4(p);
-            FlowUpdateTtlTC(f, p, IPV4_GET_RAW_IPTTL(ip4h));
+            FlowUpdateTtlTC(f, IPV4_GET_RAW_IPTTL(ip4h));
         } else if (PacketIsIPv6(p)) {
             const IPV6Hdr *ip6h = PacketGetIPv6(p);
-            FlowUpdateTtlTC(f, p, IPV6_GET_RAW_HLIM(ip6h));
+            FlowUpdateTtlTC(f, IPV6_GET_RAW_HLIM(ip6h));
         }
     }