From: Victor Julien <victor@inliniac.net>
Date: Mon, 30 May 2016 16:01:02 +0000 (+0200)
Subject: flow-worker: small cleanups
X-Git-Tag: suricata-3.1RC1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181f67ff97338c78a8bb19821d36859b60df8ff3;p=thirdparty%2Fsuricata.git

flow-worker: small cleanups
---

diff --git a/src/flow-worker.c b/src/flow-worker.c
index 4f96ac1f63..154b3948f3 100644
--- a/src/flow-worker.c
+++ b/src/flow-worker.c
@@ -70,7 +70,7 @@ typedef struct FlowWorkerThreadData_ {
  *
  *  Handle flow creation/lookup
  */
-static void FlowUpdate(ThreadVars *tv, StreamTcpThread *stt, Packet *p)
+static inline void FlowUpdate(Packet *p)
 {
     FlowHandlePacketUpdate(p->flow, p);
 }
@@ -148,8 +148,9 @@ TmEcode FlowWorker(ThreadVars *tv, Packet *p, void *data, PacketQueue *preq, Pac
     SCLogDebug("packet %"PRIu64, p->pcap_cnt);
 
     /* update time */
-    if (!(PKT_IS_PSEUDOPKT(p)))
+    if (!(PKT_IS_PSEUDOPKT(p))) {
         TimeSetByThread(tv->id, &p->ts);
+    }
 
     /* handle Flow */
     if (p->flags & PKT_WANTS_FLOW) {
@@ -158,7 +159,7 @@ TmEcode FlowWorker(ThreadVars *tv, Packet *p, void *data, PacketQueue *preq, Pac
         FlowHandlePacket(tv, fw->dtv, p);
         if (likely(p->flow != NULL)) {
             DEBUG_ASSERT_FLOW_LOCKED(p->flow);
-            FlowUpdate(tv, fw->stream_thread, p);
+            FlowUpdate(p);
         }
         /* Flow is now LOCKED */