]> git.ipfire.org Git - people/ms/suricata.git/commitdiff
af-packet: simplify tpacket-v2 setup code
authorVictor Julien <victor@inliniac.net>
Fri, 5 Nov 2021 10:31:58 +0000 (11:31 +0100)
committerVictor Julien <victor@inliniac.net>
Thu, 11 Nov 2021 14:55:49 +0000 (15:55 +0100)
Setup can no longer fail, so make the function void and remove dead
error checking code.

src/source-af-packet.c

index e6a214bfc107fff6a2ee8ad0f7b3e554ef18dba3..d285faacbcfa01efdec9f835e8c261f6ba058953 100644 (file)
@@ -923,7 +923,7 @@ static inline void AFPReadApplyBypass(const AFPThreadVars *ptv, Packet *p)
 /** \internal
  *  \brief setup packet for AFPReadFromRing
  */
-static bool AFPReadFromRingSetupPacket(
+static void AFPReadFromRingSetupPacket(
         AFPThreadVars *ptv, union thdr h, const unsigned int tp_status, Packet *p)
 {
     PKT_SET_SRC(p, PKT_SRC_WIRE);
@@ -982,7 +982,6 @@ static bool AFPReadFromRingSetupPacket(
             p->flags |= PKT_IGNORE_CHECKSUM;
         }
     }
-    return true;
 }
 
 static inline int AFPReadFromRingWaitForPacket(AFPThreadVars *ptv)
@@ -1072,10 +1071,7 @@ static int AFPReadFromRing(AFPThreadVars *ptv)
         if (p == NULL) {
             return AFPSuriFailure(ptv, h);
         }
-        if (AFPReadFromRingSetupPacket(ptv, h, tp_status, p) == false) {
-            TmqhOutputPacketpool(ptv->tv, p);
-            return AFPSuriFailure(ptv, h);
-        }
+        AFPReadFromRingSetupPacket(ptv, h, tp_status, p);
 
         if (TmThreadsSlotProcessPkt(ptv->tv, ptv->slot, p) != TM_ECODE_OK) {
             return AFPSuriFailure(ptv, h);