From: George Koikara (gkoikara) <gkoikara@cisco.com>
Date: Tue, 25 Feb 2020 14:25:57 +0000 (+0000)
Subject: Merge pull request #2032 in SNORT/snort3 from ~KDEWANGA/snort3:backout_IAB_changes... 
X-Git-Tag: 3.0.0-269~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f1b9b65f6e9111671ca19ca1bc86bfa9ffaf185;p=thirdparty%2Fsnort3.git

Merge pull request #2032 in SNORT/snort3 from ~KDEWANGA/snort3:backout_IAB_changes to master

Squashed commit of the following:

commit 19314b6ea33ab3b634cf221eacf216e85d5a7d56
Author: Keshaw Dewangan <kdewanga@cisco.com>
Date:   Tue Feb 25 08:59:29 2020 -0500

    daq: reverting changes to get_stats declaration
---

diff --git a/src/packet_io/sfdaq.h b/src/packet_io/sfdaq.h
index 20f86e472..a1aeaa202 100644
--- a/src/packet_io/sfdaq.h
+++ b/src/packet_io/sfdaq.h
@@ -49,7 +49,7 @@ public:
 
     static const char* get_input_spec(const SFDAQConfig*, unsigned instance_id);
     static const char* default_type();
-    SO_PUBLIC static const DAQ_Stats_t* get_stats();
+    static const DAQ_Stats_t* get_stats();
 
     static bool can_inject();
     static bool can_inject_raw();